diff --git a/Manifest b/Manifest
index 1911a6d9f998..e887ca6960ec 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29275 BLAKE2B 942428eb12c113560fb579d9d19aac4f927656e68ffbea4cac42acfdbc72325ad054a88c8fa68f5771ab89dfa8a6e0f2af4fd7b33d175a48bd57c72c0f6f6295 SHA512 c146c00181fb0ff52359be6073a0bcc5ad93a182241b52361f50a4c8fbb339af19822c2ea6770be982fa953b88202c02bc06dc4978b18758a24cdf0a247d876d
-TIMESTAMP 2020-11-28T07:08:43Z
+MANIFEST Manifest.files.gz 29261 BLAKE2B 6c0b53af0be639907d9fbd7ca7bacc85b379c0ee0fc89dc57edb6ad8a6f28b2c9528d9ce67506e015812c618304694cc2a98b6b3faef5f6601d0f7017b1297c1 SHA512 c53606f2adb7f644fc845a59c9a3c3cd0ee6afdb45b314d23cdf7f8fc1d120cd173fcbd13680c07b88056238e572b39c3819107962b1eb564d678b3fb314548c
+TIMESTAMP 2020-11-29T09:08:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/B93tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/DZRhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBqtg//XzXWVT4Vbz1pH78b3jaLB0xCp4PqtkKVPbGtDvKWU1xwU9/KE+GhENBn
-ZKO5+aBFFG7B7K+lFnE/+00u+Yn6ffVE/90f2BKBdZpGpYvh4soclcYivqeCLege
-guU36ZOAWYV/Izwm9lI1TVSoi8y9jqIfDVWHPIeqh/uI1BFPEUrUapfrTLBTl84z
-wq/EHUr2M0dhDxthzPDsQv6+tWt1525ogTVzbBXc/k0puaVFIQxF/FjXwdyf4OM9
-jsY9j7cVkGgFpdyliN2u56YFvF5Sggx/S1tG4weLqOG3JU/QqwpIchBkbP0/iFYn
-bgOUovlyA760Ze343gcTt4spp4urvRcULo0cb8tdVGutK2164tcfYWjjBhHImfbr
-L0QbRfq3B0jbfAVs/AeEIN+e8a6OeycjP85uKJRGVhAaD2nKSH3DucJmDurUJ9wN
-iioVX6Cvt4on16tcdEwMs3MuvppTsziyc1EP1AYANksWiIMl26xLrfTLSVuFC5LD
-aUHRLdQRA1a+0yTi35ceLGiJKOY/bqdOXU4aALTmRkm1QOL3GK7uxex+rFdt8af2
-6cuvpZe0M/AfFs06qeL8rVVwpaxGliFZK/Vk2O/fgHKoQTc1zwlRV1rJAa4AQG0U
-e6htmDMtnUhXB4vI3CeCrERR/jV+wyNJPSimXZlghVant+X76aY=
-=2224
+klATYQ/7BLhxxOE3OvBkP0zbatLlZ1HjG8A0gtK8Xrpd7NOfHMWwc+I1Z60CbcoP
+iLxS+ZLq2xFPgcz0hb8ByoZ4u5o1JAK8/PvMJuv3YYVWHp5scLbHsBr2gEn93EoY
+9Q9L74DNISAI5xs03dxWk/8nQpWV9Ukc1BNpfllVESLOU2il4miE6if+glceiVfX
+s6fcCrXL+i+Fih6T3jtWbviWyqzQZ6HrPgk0+uBj4uoyHrLkpCcKo6vEZmPKxuqp
+esPHIM2OTDJKj97aCRckGjHQvjuU2rs4gIRQeZeWeYEihHc3SwWg0Iloox6mRYBh
+j2pvel+9MOZq3Vm2fztqdwUqnz7afe+YutCCbJ9ECf7ZRV6L3u0yX9MCFox4/+sR
+LeUcGMY2DpoBw0vlUe9WRPcMHnMNxgZEsT/ZGtkg1xRroCoJW9tvp495WSMspaAp
+fIEx1bcgAWc4uixql5WmQWEgADBRY+iHsl/yilj20kQuOCX+a4q+KfMm6uY0Tbj8
+w76ILZrspx5S4CQrRfaNNP/CHl9eBq6LIlAPSTYMLJKpTDjOPcXxY0haBv+04dwJ
+Wue/gaG/Zbd59DjjVhBb+0ipjcU7T4tpzgo9NhQXg4n5VjBIKvzwpcbiaMt7mB4V
+CDm8BIdySgrmDt1xZ8eGYO8x6MiDzCyZpM6GUGkwKfnyMABI62Q=
+=+Ar9
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f0ca2a43fa86..a1f24939c0eb 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 0757076c3bcc..1611dcc62249 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/sniproxy/Manifest b/acct-group/sniproxy/Manifest
new file mode 100644
index 000000000000..094a6a0a54ff
--- /dev/null
+++ b/acct-group/sniproxy/Manifest
@@ -0,0 +1,2 @@
+EBUILD sniproxy-0.ebuild 151 BLAKE2B 35f8c5e3a14bf946acda2a2a4ad7b640b7038c5fb230fdcb41ece3b715b0813f8aa6d005969fe65f4b536df8df21a590884c229787bef3c1868aca331c1bc562 SHA512 bb8db76e5d95374e5549757bb7931c1f154f01f82fb61c816f0877813ea420b292ad80678c787abfd07221ce268e0ca9485bf7197897e5fc2385ebdbd35373fe
+MISC metadata.xml 375 BLAKE2B 11e88c4b125207b665bfc408cb1bc06f0a449384830dda3e38d83d2dfa922beb0079dc26fc84aecd22bb60543c1af002823f1d24996d84333a1aee3742930e6b SHA512 cfb08b91f3bc6f7596b7ecc20b490a1aeef40f41d29b57cd4a28cac579bbd2bc05801feb95a341e30f192729dce0e5547972c555a679faea15156c56d1040ec9
diff --git a/acct-group/sniproxy/metadata.xml b/acct-group/sniproxy/metadata.xml
new file mode 100644
index 000000000000..89aeeb96e865
--- /dev/null
+++ b/acct-group/sniproxy/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>nemunaire@nemunai.re</email>
+		<name>Pierre-Olivier Mercier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/sniproxy/sniproxy-0.ebuild b/acct-group/sniproxy/sniproxy-0.ebuild
new file mode 100644
index 000000000000..526eb45957e2
--- /dev/null
+++ b/acct-group/sniproxy/sniproxy-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=366
diff --git a/acct-group/ziproxy/Manifest b/acct-group/ziproxy/Manifest
new file mode 100644
index 000000000000..275e7ed9e82a
--- /dev/null
+++ b/acct-group/ziproxy/Manifest
@@ -0,0 +1,2 @@
+EBUILD ziproxy-0.ebuild 151 BLAKE2B 567688f6e05f9c5d396fa8cb2e885a9ac033a4d274518c0aef852dae9b6d5ecbbbea4cdebcac7df13ba31c7796cd0444dbec40127059591bfef65d0209e30d1c SHA512 107adfd461a983162bc95b23b9216587ac5e45caff893eb41cac913db1e82370bdf5c1315adee5f60e480d4e39487385204a5567e5f3eeefeb751004044b430e
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-group/ziproxy/metadata.xml b/acct-group/ziproxy/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/acct-group/ziproxy/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-group/ziproxy/ziproxy-0.ebuild b/acct-group/ziproxy/ziproxy-0.ebuild
new file mode 100644
index 000000000000..2a615442577d
--- /dev/null
+++ b/acct-group/ziproxy/ziproxy-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=367
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 16f0e4035ab5..31e08dd0f313 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/sniproxy/Manifest b/acct-user/sniproxy/Manifest
new file mode 100644
index 000000000000..ebd85edfef44
--- /dev/null
+++ b/acct-user/sniproxy/Manifest
@@ -0,0 +1,2 @@
+EBUILD sniproxy-0.ebuild 198 BLAKE2B 8245a6d58456047d64afe6e98aca816155ad5cc6235f96d773500b2f034af9977b4600ff0934f6c36d957586beb9d8e2d4c97ec792862dbdf4a22be973b46d62 SHA512 02d651442209696e263bc90b2b6276ff0e616a12f2153b5025ec042876b92fdd626b399951ce2f1b251a2a79f3330bb40c4d47e51d0d526010ab5e8653639d03
+MISC metadata.xml 375 BLAKE2B 11e88c4b125207b665bfc408cb1bc06f0a449384830dda3e38d83d2dfa922beb0079dc26fc84aecd22bb60543c1af002823f1d24996d84333a1aee3742930e6b SHA512 cfb08b91f3bc6f7596b7ecc20b490a1aeef40f41d29b57cd4a28cac579bbd2bc05801feb95a341e30f192729dce0e5547972c555a679faea15156c56d1040ec9
diff --git a/acct-user/sniproxy/metadata.xml b/acct-user/sniproxy/metadata.xml
new file mode 100644
index 000000000000..89aeeb96e865
--- /dev/null
+++ b/acct-user/sniproxy/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>nemunaire@nemunai.re</email>
+		<name>Pierre-Olivier Mercier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/sniproxy/sniproxy-0.ebuild b/acct-user/sniproxy/sniproxy-0.ebuild
new file mode 100644
index 000000000000..d7566da9196d
--- /dev/null
+++ b/acct-user/sniproxy/sniproxy-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=366
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/ziproxy/Manifest b/acct-user/ziproxy/Manifest
new file mode 100644
index 000000000000..174b7eaf6d6b
--- /dev/null
+++ b/acct-user/ziproxy/Manifest
@@ -0,0 +1,2 @@
+EBUILD ziproxy-0.ebuild 198 BLAKE2B c87c7027f6a209f3bc63222cbc919368163af6455e3be36592f9335f7f83c1db4159a42fd647ab15bbfe6ce1330e76086436b97c9235e39dca9a285dc5ad222c SHA512 174a0454c88a39b6c85885a876fa644fc969ec2baf3ad6ee787957cd717f2262d4a08cb4ba25de76c6d72995f1fcfd31f2cbf9cfe33acd2bd690f743dc2e59f2
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-user/ziproxy/metadata.xml b/acct-user/ziproxy/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/acct-user/ziproxy/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/acct-user/ziproxy/ziproxy-0.ebuild b/acct-user/ziproxy/ziproxy-0.ebuild
new file mode 100644
index 000000000000..ea999861d750
--- /dev/null
+++ b/acct-user/ziproxy/ziproxy-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=367
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index af25474b5c22..e13be50ae17d 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 44978f51c91a..b772cee8ebf5 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -3,6 +3,17 @@ 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 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.51.0.mod 1226 BLAKE2B c58a92fb234f949137fa6a6369308f104c2619cf6af1b0a727dba2e6d0ca9297521f9236d15389e40945f314fdd3f03cbaede2a5e1a2f5b96a983ddc26beedd1 SHA512 dbadaecbd6db504404c9bc700960c20678af4ba3ecf517e993589bc3b124654cb8ba5585c77d3e454ab3e5a5172c2041ef9560ed2776fde91bfa5d92c95085b9
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip 1283809 BLAKE2B b704166087a43d4535ea1307ca01f42db82aca7f1fae12b308f16264cd08f95a8631e8f44594370a5937ea095bf8ed5f13943c1f91f35cb5536613811cc43be8 SHA512 f37caaa630b74006467930113b86137c0d3a2736877d1320ac26ff6da628587e29537b6ce215d1f2b7304b5e75897f7644fc8ef005496e98a6a07ec530cc3d33
+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%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 dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 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
@@ -10,21 +21,31 @@ DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv13.3.2+incompatible.mod 36 BLAKE2
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv13.3.2+incompatible.zip 23538 BLAKE2B 68c04a103b52b9da7185e939afebb9539f0587038b16f0d608f449c79ce2b2247dc9cef695f251f2946f4fbd87f288891feaa90543a83fbb6495c49d68bb4b96 SHA512 25a63d302283a7c9e94a5c6737e3b16dba49c8cb4e3580a155a838eb197b1c700e593d62cbf8746044c0f7256b6170a43273ff9440619413bc5670e117efc1b5
 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.0.zip 96932 BLAKE2B d2dc2a89edf90b671ae441ab2c2ca6a5aa2b228cd5279f78714f43563ce98d5755386fb544fc007886315b4ebfb139205f70e5f7bc8e3c8e69fb779162e3848a SHA512 ad0798726a0c4c15525c3511b28785a626d6835e872956549d38ca1fce7351a2c8be930081c6d2f22c409665218bd854c54460e149a91dfa9f57d6fe6ef2ad1b
+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
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.zip 38083 BLAKE2B e796f7659059c9bb04caa298c94a318fdcc3e251a4caccf71a973ec957899cf49ada77fa866b1883036aed3942f0887c88ef33b22da1387e55bb2847bfdfe0a4 SHA512 16ccb2211f3acb23181cfaa941e5d757dd975a8491cabb0b083411dc7c431c3230aaa7158c03d7ffd1dcba4535d4ab170a6d110c1b9d91ca2553d665767f53ca
+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%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.zip 17111 BLAKE2B 67e9376554073b3fe82834226831bd7ce92d34c9f75240c3423aa3db4e5ce3cee445bf2df4f0f24a61a4f3823c33fbb92e0986f0e5e6860dfd4f5d157e2c5047 SHA512 50182309e9823fe6a3af86a9beda7ea9a2ffd798cc0d9a97481324a205db8ca50f524ec1b482cd9d8ade987c6e7dcc511c2d6937f31d38195f4b496d42e63bd7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip 18897 BLAKE2B 984f84c50aa5024a3eb78369d669ad73e9b6a7ee6bc7a7ae95667d29706bbb7f6d1f06a8e8e98e037a1226ac9f9637e6072735a3d01b8467f3f21657ccbf7929 SHA512 3eb5646b62d06c1d610de05889dc4533e0bfe1ee5de2fd9feda4f4dea0606ddc7c667a41c73687460ab1f28f4fb17ea9b3f79b5c93ad6c4aaac6b0b9f15cd8ce
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.zip 8064 BLAKE2B ea125f3a47a9eeecdd9d7ec58d3bdd9e1b1648bcc8f452eff95e9e06c104d88f52a54ea59789ff445830529d1071f551cd562e695401980c2764f1693a6e75b1 SHA512 2d0466db712cc21e33101ddebd3ee1206afa7412bc9a76119ef2f2516384a85f77fc3cf8b618069157c2a0670f500f0933801e43cd4d1d522d81b27e51390f69
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e
 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%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!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!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
 DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.4.1.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
 DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.4.1.zip 54053 BLAKE2B edbbafc09d77f9c148eea7b1a81aa59fbfd674be51dd514328899709cc5f19ebd41d93fed2c5dc1303680e667cba0472d46b882b669cf58f0caba70f7c85fe69 SHA512 81e8da102d3ee39631bf160bb44e6c6c9c59bb381f21293600cbbd93781120c1891178ffc513ecc41573d81e7000de8e365e7ee723a108ce8648e1854cb4887b
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.5.0.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.5.0.zip 57725 BLAKE2B 1283e08db8856eaf7be97f60e4f5248ff7c64280900ec8832979471bca50d6aaf5c620f2a53c81b3b835f86ee2dc95bbda5541a7f4d33480ba23b7da1cd90cde SHA512 18c8e65a2b5c060123ee5fab96ba476512c9ec7a393b25d91fb5992aabc868b101370dbe8fa5ca2438c5572fbfc161b859ffec56a6e84531869d5bcdffdcad6b
 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!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
@@ -107,6 +128,9 @@ 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%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod 38 BLAKE2B d8a847320562a5d1158e868d3ade028d83059898bad409051f8a342843ec21d8df4305b50b35b7ba7fddad63b53f38c5689f4f7053cfa510a2b222a043880748 SHA512 b3a401f05d85f8d687fa8387b475211ec627c7d2c80f5fe1b5a4d97a41df7707d0cc0dab634bcab246f43058f204f10b45ee4cea5f61d8e7cb88c4ba8f085dd4
+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%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
@@ -181,6 +205,7 @@ DIST github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mo
 DIST github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.zip 54571 BLAKE2B 5e8833cc9d33f05ed9dbcfca9ffb899f2b9b772e7bf0ea498316fd0d827453ee7f851c7ee63b2ae04c9f70ba983687757681746921f7a605c275f115f184caef SHA512 324918b4336dc71cf6e2fa2847a6c125dbf211113c554e4a65e25fbad8dd56acf944369fba472867ca176e637cc847449cfebf89a083fdf972fecd5b3927e12b
 DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
 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%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
@@ -201,6 +226,8 @@ DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B
 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
 DIST github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip 12204 BLAKE2B bf6a8261a8c28188279787a64c7f623c261944077babc98680b4575659d8fa2f53a7e8d7ca1f1b606d3fb778060e37e91dafb74796c9135c637361f0759c34ac SHA512 90e22e25cc68002193dad1f28fff7c271928f0de2fd86fff149a6f2e9e6833dacabad7f2ad991bc4bf520a5f5bcebf24150fec3f3bb92439cc3bace60c304830
 DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod 34 BLAKE2B 85d050ce327c96665aac0e7954761b42f6d30256c4620a15a171ae3a92abf4ed45d026973d9d74fc07b90617885d2c002e45cac9a38f03f12018d86c091981fd SHA512 547267e05f39979e80906176e520bc4e74e48f9f96ffcd9d862f974972eb8238b28ed0a0ac891e3e0ebd6d635de98192a38534155fed9eaf44ba0b94c5ff1d9d
@@ -210,6 +237,7 @@ DIST github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod
 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%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%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod 34 BLAKE2B aacafc6177e1e87c8f4a17f295900d749608f722755d31a1939d1b601e4719984c0d1299fc4de9fe74c1109852009daf4641cb5c81629788a639eeb9314867c5 SHA512 c4b5fc4230e8e9c7631f577ee15414f7a72bfe27af524fd6bfad8c38a81426411dce35a191d840a9c69eeedfeacacd3f2a108c5eec35a3e30b0a7b262b15340a
 DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.zip 44132 BLAKE2B 8e06264f68464b00ed9aaa2f9eaf2a2e823d603f7bcf70003b76b896349ce0f9f4f068ba1a7c035cb3ec2932d72cde88d94e929ab564babed04da778476d0e26 SHA512 6ab36b2e7c2848649a3f7cc53b1cde73b43745077576eebf432989511096313291d8f5809e91306120f2bc1c73362a810b9f3d87a4dd93c8f885d18d8947c051
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
@@ -217,6 +245,7 @@ DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
 DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
 DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
+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-ini%2Fini%2F@v%2Fv1.25.4.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.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
@@ -225,6 +254,8 @@ DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b6
 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-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
@@ -291,6 +322,8 @@ DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod 39
 DIST github.com%2Fgodror%2Fgodror%2F@v%2Fv0.13.3.mod 265 BLAKE2B 0c35804e140597208249f6c44fdf85a69ca3657db095e99ea69a46db794bc9f4b1c036afb98cc2bb0083b3c585a3fcdfdd2a6fa0762be059d2d77430890c3496 SHA512 f6212b0f7750a77d4d70cccb317ad0679f2758fbc228c574975c2675181f0b665baea33b6d1bb5a1652f563dc857fbe99485c715983f34d786e42e1f32260fa2
 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%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod 34 BLAKE2B 92cad2efe22c009b9447a03343841c211ee06e0a78939c6ecf3e367dbd50c725562f6c09705f8fdf8131a9264a814d6822d3724a15682f446ed869b97febe388 SHA512 38d3341ba73f1537bc4df9c5a3938d1e0effb065122b4b1ebb3277a33c3e70674b28a32ffe8a79ee8b6a353233c6ead616b7749244a3af10306bcaac678aca8a
 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
@@ -305,13 +338,24 @@ DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.zip 39653 BLAKE2B c84bb2352695575c56a32eb0e7a8d93818b15625d850ff662039e5650f78dcb06a093203d0987d00a2271ad02e811182cc7fabff7f8b5d5475ff2628d18bcb13 SHA512 050f33b3dd4053885c46c07e7f56cf45d6addd908549ca5ed98036aa14e964a7ff4c30e08887979a69f25df85af131491fc80a62c36d038b1f3af5b3b06756dd
 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%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%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.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.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.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.2.zip 206762 BLAKE2B 13c74350dfc3bf39540c37f6b7771f18930d6bfd6a5c83c27c723065da6458e0de544a6fa4d57c027e6c67eb528493c620228a56249b889f00d67a064218dbb0 SHA512 3d92469995664037149e3e11363db685b3175fff01f4ef3b578ada273853a16131b3c97899b497ab75ffbeb6191fe59a28f073779828f719681b8e15182b6211
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod 35 BLAKE2B d6addf74aa6a2ad97c1792946aea166c48bbcf35fbc582a9dfeabbdba68992106b7cc7b2515ccf002f44bc74c0f0655089e3110e39fc312a683b1c364318279a SHA512 33a68d466b4aee3c41e6d70766e90fc7b7b8e904acb360d1a5e15236832ca47e5f45393a7f5c486893f6a8ca04af4ca4ced27b064c15a5189217141a325972a8
 DIST github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod 35 BLAKE2B 2266c9ec6e2058e41afcb70dfe33ef7bd1d4c0dd3ef6af9dd85d9f86ac0c5ebcf231c21d66a0c34d6e5930e1de410ad482f7774a42398aac213eb0146c2a00ef SHA512 17790f178fd61969fa03eaca0c0a546ccb8215016d44bcec8105cba39a188c855b5f90c7d6c01fece401167daac2b662405532ac3b38e0a167a2629e6d52a01f
@@ -331,15 +375,20 @@ DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod 41 BLAKE2B 32370943a480c1366
 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
 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%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%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%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.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.zip 411726 BLAKE2B 6ee260803ad6b9edfa2cae99d831be8ca468f58463aead297358e3f6857b97503de8253b61e1fb9c0489526fa9937d6dbe57a50cebc31296d219ba7b834574d8 SHA512 413d7e0ef65ea9a6315a393a72caad1288b4b9a78f545d1bf930622404540af6550e0f3fa405ded6902099a271475d8196de7d5dbcfbb66e89c5fa1f7b2b41da
 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.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%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
@@ -391,6 +440,7 @@ DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc7820
 DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.mod 43 BLAKE2B ea72fa407faa556d4164e25aac2a8093cfdd8efdff6f68f9ebb277ddca3aa7efe0df0f22546a36fe6858c22dc638869cadcde024e32d0a930e0cf12ef5b17c7b SHA512 f6d3531d393904144d7c84cb254becfa2dad42f8695ce32e3f44789abe89d60019f01543936a64ae1728f8d395dd96bace969282e3cd9f8a9eda8085d3d1475d
 DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.zip 24521 BLAKE2B 6fbe5fc8d03415b09b19029c9df95e8a3169c4d4181a988167a104b91f81b5d359779c9f3b51e71dbea191c8f4bdd70fa11d0f47235a10056725f0a6c97303e3 SHA512 20e6207e6ab0e5bd23e4e496c19573345228e0abc804db1a17dab11dfc2c9926200fba671292a63f09b88b91905d867d817506a7bda25c261b3c4002cab9e961
 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%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%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip 28698 BLAKE2B 76fa171ec22419b864bf42855bc0286059dbb93de9e174f8693e132679c762346b1e7ade3616404a20b8b161336d1cb2ccda1c7366a1b8d9e329a82d4c2775f5 SHA512 6dbdd7d3f35f7b6fb1088c28dc1d05bad04fc46d907273acb55e991c708e7b06f5b2db86ae2d6669f0720c3bc95816971ec4b39e897e714344817a83d9ed4583
@@ -406,11 +456,14 @@ DIST github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.0.zip 60383 BLAKE2B f114ffe3ef1bf6e
 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%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.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%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%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
@@ -424,6 +477,7 @@ DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip 39
 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%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod 34 BLAKE2B 1365a1cf7687e1b4d333eadaf4871aa7a00c98f5d235453d7e4e000b51127ab036d4b20866f46343338aa79acaf71dcd8c847aa0b1568e7df9cefdc05b33f009 SHA512 ac5a145ff4464a083cec55891b85876ba0280c7115e5be9b70b3300311515260d9e03a94faedcd8eab5a7a2de838448af1a810c0e9f01cb8521582dafc10d78d
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
@@ -436,6 +490,8 @@ DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.7.0.mod 34 BLAKE2B 1f70e2e8670ecb572e36b3697429bbe82bb3372aa977eb116270674c689b66d2195dff69887c8555bd886a67a07bf1bf5d43c2eeca0bbc51b6613183378eabef SHA512 f0f38407ddaf1cddb83a07d7435e78dc4bd789761325b68d689a6e571e8d28ae352717a7aebabf4b63918fac9fb792f6b7ecb0db4898b563706e1fad9c30e13a
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.7.0.zip 118248 BLAKE2B dfb22b271b3d13a80426011af9eba01ca5bb8331a7bb51a86f9091e051685a9c29598a1921e3ac688561a33d1fd2cb7dc05bde1d448918f5b587923b3c1b9d4d SHA512 28d66049239d7e1cddfa7248d3da097e51bc8daded19218b7a93b1b87d79a3ead11c710bbeca675128a130dc89ae27a5fb88fb2e63a8d435f25d401c9fbbf148
+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%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%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod 267 BLAKE2B d2298b42ba1b8aed99658a846dd1ff5cadf5403411766efaa880ecd043a56703ac1089ea5edb04b391d710d99f9b1a1471628043be868fededf189130bf852e4 SHA512 76b19a140339b43774f3df87d1de97dd4bbdbf5939f523fe39faca051dd2a4b9e719dc147a0a2f931fd30871c30eb6a628d58bded12271e04f6de5d9dbab497d
@@ -467,6 +523,8 @@ DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.12.0.zip 2344176 BLAKE2B 5e5fedab
 DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
 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%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%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
@@ -484,6 +542,8 @@ DIST github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mo
 DIST github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.zip 5590 BLAKE2B 578bbdeba2204a0acc470957c0d886e7a9efd2d5114a9a514044ca3f60267703a95f777a2ebd34a6e90c0349c3d3d38adce6f4ef2a001d68e1fda318eee05a05 SHA512 926263c71d04ddbb5f152b42e65985e6fae8e3bb33a35ef034a1c8f7dbb866a309d1705dee43d2af8eb9499d34d21f27a6d8c4579c13833af41e4a0176a4f299
 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%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
 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
@@ -574,6 +634,8 @@ DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3f
 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.3.0.mod 375 BLAKE2B fdacadbb6c23350ffa04e625324420df9b523d9fe5bccd8bd1d8f6d592d7ef5a2b4620c1d16c78bbbbbba2716f3edd015cc16ae5b0c3c31e5959ed12143ff3b2 SHA512 e98ebe9ff7f5f5c893ce7a54c12b3d5b86ae1f99a5117875bfb78aa2b59d9e9a95bd54e45e1a16e8bdfa79f38192626f49366a0ea4e36a25681e7448b544b144
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.zip 206553 BLAKE2B f0372ca13eb04b6151ec827549c17f299cd630546647067671dbeecd736ff36038724a3eedd6b6ba1c387543da7d8484a8bc560ff634d062b0625e84a19e9cb0 SHA512 60c005a561261f70c098f0493bf09c3c02a617398482b3bc24c81ef1913a3727467034aa6a3d14038d57de56aaa46587a5cb127e097a15877f38c252b2d0860e
+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-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
@@ -585,6 +647,8 @@ DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8
 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.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.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 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
@@ -600,6 +664,8 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.zip 188550 BLAKE2B 6163258786861881f6a7b621f8578e8dbe3eccecee396c3564a88686cfe72584e234f593847ee5cb4fed6a6a1009f1f14da8238f967ce5d68ff919410d25d8df SHA512 42a764174dc4a56c6e27b0e83004f042b3fba397039a923310b8bdfc658ec24096395f27bbd69e8275c1d0f0ea45ed68c2015ffdcc74b6186c6d1497f0ea1e6a
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip 210499 BLAKE2B c21ca6fdd64535b648cacfb74fa2d23d05d493703cb7b775ec014a9efcf3e07557e0276901db2c309174f12800c6e2f438fadc5054f0ca233c65d3523937bebb SHA512 f9f9fe1e114a4e2fe4d27a836d3989b838b1bad72cbc1652570d26ac9253cc26aab01ca28c949b2c4441a7cb17e87c1689d21588093836873350d7342e8d543b
+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%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
 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
@@ -628,6 +694,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%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
 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
@@ -691,6 +759,7 @@ DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.zip 138176 BLAKE2B b8e4a7
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.mod 33 BLAKE2B 6f03d324264d6508bec7b0d2075be3243927963f196b7f394ecaee719e93d0c01e52599e6be1776cdf8eaebb12ec16eb2af426ed1295111ba137fa76a022303d SHA512 2d1cc625394c148f83dd01d72770770eed383ec6797cdb2470d2f7e5d7f9c5cde07aaf003cb46dfe12547491aef79c119582777ffbb9482dbc5667828fd426f2
 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%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod 40 BLAKE2B d9bfc152a45edf20400c8f59ff6f7d20ac98441b3bed903d1215a98ad5b59aa9037c3dc413b750a34d4784a14d98b6441b47f8117624acba6bf69202345c43c1 SHA512 2b18d1b7379b2fb032b531119bc11adf0d7ee3b7cb490db5fbb2d7c80f04bfcceedf474012172da27d75f4337902929fa49635a17ac436ccd3df638e182c7932
 DIST github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.zip 50265 BLAKE2B 20c87b898ab7c113b3180d9bb8a008f214701f7fd72a47212efdb26296942331f0d73d3ca490c8bea3b39932a9fa5a583666bf3173c204afc33e2bca2a5b3d27 SHA512 8a81f2adfab4555b1c700e283ac66ff0c8cf84df9d73fa4e7a3e9a033b0118c053417e7324b179dcc4118344016ca498bac06de6d5908a7f86571df979257f83
 DIST github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod 37 BLAKE2B 65bb120d06237325c63f8f722a251585f54d2e7f5c70dc35554fa50147d94298bae6117cee34fc6fa202e96ffb0878534d5eea11775a83ed514d33d4fdfb8775 SHA512 cb07bd4926b20e43b08c9f6c29a74eec6b9119421d56d48d69da58152ce8ead0520197c72109579869f3591fc8f8d05b7bca3d274d383cb65b7a023fd9428ed5
@@ -699,116 +768,11 @@ DIST github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405
 DIST github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.zip 7601 BLAKE2B b56d7ca4d7e755dd83297ca8c4ec96648a3c666fc63534882ad1c509b84c4db7b149a52694105856975c0bf8a578e6c751f4066af7751788d98b835d343e4ebb SHA512 d8e7286879e7cfa4a14ac2df3f311dde56288bad6c17195fc7d585ea428cc8fb45de4795dae22d8a22aa08b4d50b42bea4c62f18a795900912185ddb928d7391
 DIST github.com%2Fziutek%2Fmymysql%2F@v%2Fv1.5.4.mod 33 BLAKE2B 06075bbd3eb02ab2dd096de6cce4658000082d9afe5616c75d74b0dadf777263a3c914517bf0df87908d043370cd066c4a5c45b6843cf02bb3fd67928a8d5197 SHA512 cd6a60a15f71d86acc64da0657180522cc0cb7a6e43428e131241bcf791a9c73d6dd8813fb8dd5b3d8e9bf99ac9264b0519c796053a7d519bf66143e1b0643ac
 DIST github.com%2Fziutek%2Fmymysql%2F@v%2Fv1.5.4.zip 80096 BLAKE2B bca8ef9ec11f0ac9d2fe16820df45d3b1537af727ccb7884987543d196b7a6ddf41766e26ddbbe16ddffdbdc8cb6b2ce1a56f5e8d5084728f0067d1b180c7387 SHA512 99d07cd6de9d82336844cce61cd3742bd30128cfb9de97312e5d84e649ce166eed86277dc21a67625c97746e9c86ed895db1026757230dd60091343fce46ed08
-DIST github.com-Azure-go-ansiterm-d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz 20948 BLAKE2B 36ef6d0327a373d105a891d28de4a2e620856c902f5159330d8c316a31e3dab77847c292bd14e3c014203744ebdf0dd1ba1431024a52b55991e87b92a43535f2 SHA512 079dc6400c2dc53d46cad809a1bc7723b43b10939d51624a0aa48d2734f2d44b1621748ef1820843f55c07f233bcf394d2ae63ff356aa22f66df32ca40556e44
-DIST github.com-Azure-go-autorest-69b4126ece6b5257e2f9b0017007d2334153655f.tar.gz 157788 BLAKE2B b0ba1987b95af4cd2d742061bd337eaaa0d9cc339d2ac2583d5d166b957692373f0444fea9c1f4c01a78dff21086a186135290373020c8a4ae664a74b5dde5a8 SHA512 e2225fb6ff49b62bbac42d1a72bfbf953ace8e73772fa41c23eb8cbff16a0011d5e281c078f30a8d5969912ffa264aad446d2a17a024950cb25ec2a8937b0e27
-DIST github.com-BurntSushi-toml-3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz 42084 BLAKE2B 09e4447d28ddb0824547d9aaa84c3c16acdc309faaf44434119e1851c40b3d3f67d0cb745691bf47a560084c93a9ce492c715833405061e5fc6114cd674b37a5 SHA512 bd14b162d4d33f62dac4abfe3bec908ea45dce88b9a0e5dd173e9f0576e29344c5136bc48e5c6602add41ddb71523e831c53107b47c4b36832c97e7b0a3d18f9
-DIST github.com-GoogleCloudPlatform-gcloud-golang-8c41231e01b2085512d98153bcffb847ff9b4b9f.tar.gz 1922404 BLAKE2B 09d935979634506edfd69ee6c72650a4eeaa4a6e6402e0e8b10c8d8a03b783c935dacafaff4f462e14ddc79319be37d36832ae757478afe3f0bae4c4b306f763 SHA512 7edef0098965732f64ba974fb90e772325f5079fec10bc7986cd8d82178dbf906a2b17a83a58bc655bd0b5138c61aa187c4841a2f3213716035e5b9cc2f09193
-DIST github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz 3384 BLAKE2B 5eb9bb3c88a3bee70cd64f30afcc039f2f43b68be23f39c72f9091765388229a8f5bdbfba8d11d1916d18e9c785e15959c000337461e44940df0ea40ecce40db SHA512 b877b8b0e67f300ed9773b32593a1edec2fb6df3b0d5026cc7b67490ec9a4cb0d9630fb30dc3dee6b7081f81c3fbf1399809c4bb171a5afab665ff93a9f3a034
-DIST github.com-Masterminds-goutils-41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0.tar.gz 14603 BLAKE2B f8f04dd7fb48c67ea31e2c438210100d671c0c017026317f43428d0460970cc6e07faaf6b3d4c2d554851dd962a7f62c8df617d0a42bf30f4d7038108f9df8a3 SHA512 05d67b1d5eb8881a9a4223d823412826d2ec035782a58879645c53e75d4e3a0a312ff70e32020d385faf6c345125edd8808b63d33c4f53542cdba73b3901d3b6
-DIST github.com-Masterminds-semver-805c489aa98f412e79eb308a37996bf9d8b1c91e.tar.gz 21138 BLAKE2B 07cb99b393f48eb0df3fcacf327e2c769791e5353bb717a998ef7acf587cd7e1f211d258cf55768d5b7951059612ddfa39e3404dc908255ef900901d16c33c6c SHA512 a442038c4a222734d0f18a10eccdc450d4c2fddbcb2b1e10bb32c70e956d74ea3a6672ffae2a89a52e92aa6bb4c75fd85337392dc1e2380d27843237f6ebec2a
-DIST github.com-Masterminds-sprig-e4c0945838d570720d876a6ad9b4568ed32317b4.tar.gz 42053 BLAKE2B dcbbcc8e9d0f3428a5d135529f0e72883263076bf6d69d2a0d543c8ef3b52aeca1d78550b3db03bf1356ecefc4201327b1de65b8d89e67811f9fec7388f3450b SHA512 8732128e531878a4498a38d9445be448bdc77f9a6236e10fb9b20f56d249edb65f76bbc13f6bb916d5a259deb7ae77423f6116f2600c803ebdf443e3cb2d82c0
-DIST github.com-Masterminds-vcs-f94282d8632a0620f79f0c6ff0e82604e8c5c85b.tar.gz 27791 BLAKE2B 4d9f7e81c9d66f7302ed45f433a9329319b75d6e1416ded87c74032a7cdcef4a321edee370305f7e6ef16f30efa70b56badbdc81b75fe90a87f890ff0cab2eaa SHA512 2fbaff5ba0cb0a651e93634ba1cff5f34c374f490c7182b904d052b22fabe717f5a478856101e8e8679ae806db0b70462f59abfe445714199fe91a3dc73b975c
-DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
-DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
-DIST github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz 35759 BLAKE2B b9406a926df5f8b27e27711ced93c9749a0d69c35f1d65c1edab7682fb039741e3825ee62f5b08bdf62d17d2373b17c974ed2653e39cc8910878a94f81b1331d SHA512 c7e5d4497201398cdb2314f8f863d717f91d52815da32abc3d3a1af00ca35696d612c64b1c2a862eb3822f555e2df5a671f2e446be7f5b5cce0e8153b9a5e878
-DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-chai2010-gettext-go-c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz 812631 BLAKE2B 576924f2df0e824490075c661b3a503b184b5d1b262c6154bc68db159b14f09fa15942e1650de20389ed950664aeb9698de2389c22dc5b9f15e335b22b87d3d2 SHA512 8def098c2cc2bd9c2a91f26473f99ac67931af968dab770e1eeb5682b3d3d259a39d4506e78e39395edc201105d6161d79308a6b17e20eb65b1349e9053e1692
-DIST github.com-cpuguy83-go-md2man-7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19.tar.gz 43935 BLAKE2B 1fb9f5795a4149e5527f80f229f074d1ce655981dc4f7cfcd6491fedbf8abae72872b4d32e5f5211abe0e43aeef9bd0030770a717a742981738ee989f3a66513 SHA512 8fe7a79dc1b046d8a967063c642942d06313f52caad27061ce03eb6b175549c58232b1d1f24f13f1313f4db6386dc345eff197a4b92df2fa9ee9605a9c108e9e
-DIST github.com-cyphar-filepath-securejoin-a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz 10810 BLAKE2B 4150ca52c8229e8d4533347b8b266b6b9421b86a9e511aa70a26a40e34c0468b0aa853f910afbd9ecd206d3c7009d36e6e7b3ac85d79aa4e738acee62bb71f03 SHA512 ca22438bc5bd9196923dc7e70748452635afb743335e4b198177b88a6e716a2677f5941a8c5352ba452faa7b77aca02ebc2404ed59918e626cf2478ea9d8278f
-DIST github.com-davecgh-go-spew-8991bc29aa16c548c550c7ff78260e27b9ab7c73.tar.gz 42217 BLAKE2B baa5e818fa0cafc3d0af4fcf158e96ff5f9820c186872c3b4038be83b41878ce7ca297216a9669b903763ecaebe7ea36507602280eb3734bd9eb01bdd54c631d SHA512 4c4047bc9a8cbb27973c7b11779388458dd9cca5937e8b65e19ea513cbc7bfe8e97f538fcc132c7512aaebef44429f531a15b367b027d731db5762b7f4a210b9
-DIST github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz 36975 BLAKE2B 8d6ae74ef5b5a07af42a81a6902cbb0dd73054a7c678f35bfc6397d7f9abd79e79204f1eb4aa46cb42f1314122c2a84134d6cdc22cdd987d1040d056143730a7 SHA512 4a46ca539ec70e5e8352621cba3b1da20ba3799bf7615b1842991471f812cb4877dc053e915def3d70120170cf9c6c25b5bfdbfaab92e0537835ad66f52cf732
-DIST github.com-docker-distribution-2461543d988979529609e8cb6fca9ca190dc48da.tar.gz 1996404 BLAKE2B 2eb9fd568a9dcc2641195dd1b303c9d27c3a65302aa9169ed89ad15b14e1e3071844063a681d4042b4e1651fee5a3cfa26e34b996819c31eb653fed0728b0b93 SHA512 ea44c5dd0f80887fd06e4e172412f71e4633d77c613318722e8e1c9b8edbdafb0c697e64290da89eee7fd3a83371c7da7ca6b9154c717a8cc1e71a889f81c8a6
-DIST github.com-docker-docker-be7ac8be2ae072032a4005e8f232be3fc57e4127.tar.gz 9059054 BLAKE2B 8c4489bde6cba2d6318f93abdad0e14141d38398de06e06ce58d4cf4c7cd8a8d6526d21e41c0433eb31a4db97fe4c8e98b48fdfd49ac15a311e3fc507af49d1b SHA512 15bfe14059103fb8cbf62a9f39835b0a38cd61a859d2feed3685a39cd38ce81f9b525142c8c7bfea66b970807be78183956c74d45a61b4161c7f41d7c7177f17
-DIST github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz 11094 BLAKE2B efc28ea5f3db552cacd9c48d7ec4de65a4f50a9463ac964d98782d62ae8c6103c119bf443d3219a39e0ed4658228a04b4a388c29ee38a05ffc3c78c25456abf0 SHA512 baf231424d453bf889e8614c54cf28f0f37f8b8e06e841c2b42ef82729afc4036018b1ca0116da33a8452a2d2345bebef5e8c66be489896db813abaac79d668b
-DIST github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz 35378 BLAKE2B dab00cf2ff22077187532a66abdd609a9101a0ca4b0fb6bcd31647e72dc491ba6ad2c2f82d3780d687dc8a95c3f499bd457abc7ca4b98cc0d08c726f13d58593 SHA512 754efd869559f96eb244a603bf575e1b439d8aa4ad34485121c76c4900150ac8a81f7fcdde4b2af49bcd317eba2212ed60a16a10cff973c9f87516bf50ad0d2f
-DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71
-DIST github.com-evanphx-json-patch-5858425f75500d40c52783dce87d085a483ce135.tar.gz 14566 BLAKE2B 1e4e84030bc17a66a92a65cc0355b3a4983a6c932b8b88225c9b64db9a6e1980aa15a743525030f0554531afd103b010dcbfbdf062693ba5730904dc1b06006b SHA512 78e094dcff9c67887f8420baaa506591e8be09368bafcd750720a4c0b563860a94fa9d8cc4f53f231fe7fd34432c8f8c78b1bd3dc7588428599fad1c6faf6a88
-DIST github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz 8224 BLAKE2B 8997719d55e4c051d7addc41bffbb11092df5dbfbcb35de6cbbd464c8232661c714bcf83eb652143b6cdf5e868b1df233d23c17c0341399410bc4f18d3188158 SHA512 1db86023b693c41a2bb80ac3e3a26f54aeb741b417ae2af81f5d4ca44772ba45a02cdb2c928cfcaca425212717ac3501b627a39fa5794b41d93976ba65c24602
-DIST github.com-fatih-color-3f9d52f7176a6927daacff70a3e8d1dc2025c53e.tar.gz 818620 BLAKE2B ac9796c56ad9495a5d209b6953f731d81317368f164dc9b6e7af2ac8a2430fee25a7667bc3b2a59b87aec8f8f5ac074c51b490007a9de76cd0f3943c83c4c6a4 SHA512 f4b07e214d43bb1cfa725bbf31035cb7874793d5097aa1a924566b4fad42c9a8209060fa43f871815a6d694b417d3e61382f49fab7e56e6d13113baf52d52def
-DIST github.com-fvbommel-util-efcd4e0f97874370259c7d93e12aad57911dea81.tar.gz 19033 BLAKE2B e68efaedf4d54041ff111dc00fa8d4470d0e0d89a2af0cd3dff09ee4d9307bfa9c15e22f5f52069e622fd895bcf101f9e0d125aefd84062147ddf851ff795a1e SHA512 f5038d650af6e794c57158c424d9a130412633dcde4a00dec9beb3819228a38faee59d91dba5ad21be12beef70581702aa22502d8ead1209458376da7d4fc418
-DIST github.com-ghodss-yaml-c7ce16629ff4cd059ed96ed06419dd3856fd3577.tar.gz 12713 BLAKE2B 639e75ce14b999ceaaaf70dd5cb1a261c1348d2ff04d754956e392e6ff486377d2d40ed155818680c7cbe399889c00a2e4cb9d36eae556442eb10ff84f73a1b1 SHA512 bacd77956e8647077700a3c6f6cd67462eb323c21aeb4185ae0f983ede8d099f84109df114cc3efb635c150d4b3729f3420920b51fc866a66210f3630684a2f7
-DIST github.com-go-gorp-gorp-6a667da9c028871f98598d85413e3fc4c6daa52e.tar.gz 36804 BLAKE2B 3f6b78fbdafadd4a4ee7d4a071fd22bf27509e6359cfae78ad905f564704a8c11cdae9af55723e67891dcbaa136fa81d905babe8ade35284a4963643207b655f SHA512 ac6c55c12fe1a44d8adddcec3559b70dbbc4892a7a58ac679c951d6c48a008cad12a1983bf5ef3a8f247ba2e7ff58ebc7d5ddb846bfa4145c26cf8ea390edc55
-DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
-DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
-DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
-DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe
-DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab
-DIST github.com-go-yaml-yaml-f221b8435cfb71e54062f6c6e99e9ade30b124d5.tar.gz 72297 BLAKE2B e9bf7f236c8bbed85ab885462790b1c5ef156ce2b58804d3562e3ffb5c26ea0214b1d185b38731befa2cbfaab6ac89face74c2207c1cd84f83701773ab94675b SHA512 b5f5e028c038cf16cb6b6d6fabf83522d9b19f2903e74004d611796a0d7c925d3e1509a8b3971b7349d05f106e69521fcefe7e9cbae1e9ac2c0180fef7ccf6e1
-DIST github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz 25955 BLAKE2B d6c9b20f80800396ebc3eba2b08ad48522d297bd0da90ed32d6ea2ea4e575e9feea112513332a3c55bbeae2569770433466536698084e787127866efaf0d25c2 SHA512 e5767898e8aaeff59219e0a0578586b63717d5c8507c74ecb813e8e8a7b02470b10df0452cc378c7f0a4b9bec030be22deb3c3ce7c5ae88fd739271cf05e36ad
-DIST github.com-gofrs-flock-392e7fae8f1b0bdbd67dad7237d23f618feb6dbb.tar.gz 7291 BLAKE2B f1b1025008a54f896c2d5ded4ae26f601fb9ccbe751bc06a1fc93e5963857d8ffcc1dd8a2709fe0b0762ee4b94e7e351d793b70f187f6ed9ceb35ded3aafdf57 SHA512 7309fe6301bf229002b28c0eafbaeb0e8d1e0500b09af6327e7e52490e003eeb291b982125780a0106333b3aaaaeaf888aef97bdf5ffbc015aff30d913f75637
-DIST github.com-gogo-protobuf-65acae22fc9d1fe290b33faa2bd64cdc20a463a0.tar.gz 2046917 BLAKE2B b0b3f7a8409647435927434e79dd5d12dad0ef235ecb75e1a1d454b27236ba0bd61dd4978fbf2de30d2b2e47b3d2be184c6d27c66209cf447ee0aec197aad36f SHA512 409f246db5f76d72d1d27e405a2e9dc079114fdce33c448400d0f37c56ea0f6d1a7109253af9625c27e526427fa0d9155111c708b4e810193e82a0340becaed2
-DIST github.com-golang-appengine-54a98f90d1c46b7731eb8fb305d2a321c30ef610.tar.gz 326123 BLAKE2B fc4ad02a715532a99688dced5ed7dfdf7f7f22f8ec913de73e2f8d0feb95de84d46d497415f4d19796de37f2234dddf5c1b4c7a2bed69feebcf709d54669b2a8 SHA512 353f9a2705dacc5f485db1faaaac3ce51dddcc2f383f9e4a3874b199d5ddb1c2ac4a8d40d82ef3fe4f20cff8940edf5ffd09caa943096084364d06eac1e2e854
-DIST github.com-golang-crypto-e84da0312774c21d64ee2317962ef669b27ffb41.tar.gz 1641247 BLAKE2B eeeefcda7ca9cdbd1519ac03e4cb195d68041efd556b5ba7999b202fd993b3dde2455bf3fad3590dd00bb1a40b01141bee12a756a6db974c8b5deebba93654b8 SHA512 3d88feb4e9c840207f3f5185b6d33ebeab673746ae2fd7a8589e6180ba5d9aac6e18229415d1acc525854fc4c717b91702701edb73fd2e9979550f82908ca754
-DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
-DIST github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz 25244 BLAKE2B bbfd67b7c9d34fe1cddab77a372fc53c899424122c46dd637186bb571e1a12dda7f0d6991bb5ad85cd0162803832e5843af6b184f861fa5dd1ac0a5cd8c7ed86 SHA512 e7ecb5c64bbb9e1fd2555ed496abb1e65f836b8017f21010dc853f8c527826eb6c315744ce991725d85e3500a6c877b3f25ba22090584c4c75dec6e6cbdc938d
-DIST github.com-golang-net-cdfb69ac37fc6fa907650654115ebebb3aae2087.tar.gz 966750 BLAKE2B fb24de16c0860ed2942a3819792d16d004be26c8682be3bd900ff31a37544791a131810dd02c90c76d3d8da0c05b441529472f69b000811bb44b8c1f18d6987c SHA512 a42d962489da4e29943bfec16a774f21bf9b63fe6e1887cded2b2c37de66d7d01ca6f34ca89eaffbc750d3cde11387b62d0487018a342dfca3969369e7651c17
-DIST github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz 45022 BLAKE2B 0b14e367f087601624a84ef25641b1f3338cc689ee92136ef51abbbdcf1b3b3dc1cad47b17868a39c1a9ecb2f792cdb1d5bb8f8ede300a5d9dc8445319c05132 SHA512 8a9ea21c4e7f9dd1ceeb069dee1987f5e5e5ba4f973572ab6f0ccf00ae6246a142dc517ef15ff83de5f3c16c267181ac3812d3c6bc0180d12b98d7540e1fc91d
-DIST github.com-golang-protobuf-6c65a5562fc06764971b7c5d05c76c75e84bdbf7.tar.gz 312591 BLAKE2B 68f068eca7c4b2b7d54a1f8775f78441f94990e65ce389aeee932deb15099cefbc1e5e24d0dd270374283ab5e2191435b646f65c376f0997e74a9300cf9c7ef0 SHA512 46170e316d5e46f01c927d00d0c953ca430463356f08f904973229fac429903760c65cdfe34b60156bd79159dc1670c88589d19c3990d7460fe6d0e235c220de
-DIST github.com-golang-sync-42b317875d0fa942474b76e1b46a6060d720ae6e.tar.gz 16241 BLAKE2B 64cd1b60a2eec29327f6438bcb6eee78eb81675996a04615aa43157b565abd3f6503edd3b6eb6c59d11351c1de1cad4d2f5ca7194f4b69ad61d198e6f90702e5 SHA512 02aaccd81a4cdbf26ef10f4693e4e102cc6616438a1d6cd326fc4d91f39ab0dee36cce364ca74c1a424a85d5d59cec6e3cf364f5dffe7262c6cb32d9e485e56a
-DIST github.com-golang-sys-b90733256f2e882e81d52f9126de08df5615afd9.tar.gz 1242904 BLAKE2B b25ad8ab9a4376ddf2b51303eec7cbb954c53693950b040bf118294484b22f27e2b463c3ee2c994b511c4d04119c85b1cc6f56a3ccee21b297bddab242f22b82 SHA512 b79478d67ae01728adcc6fe81ec91396ff2459ff0d48e05c235f618264262b393c566af902845d34f2ffecb9fcc02ced5a1476a3e00d66ee721cd20e7b49fb7b
-DIST github.com-golang-text-e6919f6577db79269a6443b9dc46d18f2238fb5d.tar.gz 6588337 BLAKE2B f182e9a40157c43aa749fae5fd6aacadf994a7c2051fc23dfef8031b243f691446d4e5c93c9b363ab22df38f533b1635aa45e23f4d8de7947ad7ab0aa8e5898a SHA512 caae52905ffdaa8e712f6b92a03a8cf9d9eba227e04ee795977c2b76bd79bc16457f846c11e45525f3e3df557fab5e0279fe098c0145b5807c0e580dd339f452
-DIST github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz 9005 BLAKE2B 5ad1988c9bd3a632ea4b248e32f6223a79d54b68b1c95bddcace042c22c20d3aee6192bf3d72def729292ed50e4d423935c3ec7004398e03037f91b7f401fd77 SHA512 65a69bfc6044de4ecacfad1c9c8add6312745bd2ba3dc46f522f1e7a424aac49b5e18aca60f8daabc340d50d73675cd5c06de9441060d86009a092feb4f5c9f7
-DIST github.com-google-btree-4030bb1f1f0c35b30ca7009e9ebd06849dd45306.tar.gz 15299 BLAKE2B e7e700523dbf1ba2f8f71d2bf8279df517787971058a46d2599ff0d4c57c00943209a5411c044393e5a15c8a233ee7135f3436ce924a2b30f107b264bd71d3f9 SHA512 c2511fcbdc58b3574ee30e4cd4ef3ab7483ffe7792bde161a9d926c09fe4ecfeaadc87e9bda84c18a5439f26db9c48499706ce8766cb8c232d0dccecf53e7429
-DIST github.com-google-go-cmp-6f77996f0c42f7b84e5a2b252227263f93432e9b.tar.gz 76176 BLAKE2B a2c233a7301def18dee5a8820daf83734c41022b391a9cc93f3af598ed60449a17d4c0ca5a6a54dae1e91375c86956accd608b1ca6941f00cec2f79d49505a0c SHA512 e2067f3159c0423b5b067581b116997d347f6f6fc7c43ccd7856877eee8c7d578350634405e082e287ae9cbb809e82eef83bc0624d25f011b6e39ef365ac09a7
-DIST github.com-google-go-genproto-919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0.tar.gz 5549359 BLAKE2B 6c3a3172e33c5f7e8869ee79c60bb834aa11da173a1b7a8c71837efcf2c026ce9c6c27f7e83418e47f219b2c7486b81925eecba8581bceae3f986f60c5874f36 SHA512 e7f42b9a1d298e8a37d662fee6d478ecf515ae13b6e9418b1b8a73e46ae3c2a39b57db723891e9709f02cd48d2dc24d046c74997c31b2c186b44afb154a98037
-DIST github.com-google-gofuzz-f140a6486e521aad38f5917de355cbf147cc0496.tar.gz 13207 BLAKE2B a64f29fbf7211d3285c46b0691e5f2ece230014c1e614552c150a45d1df218b321ab3b87c32f5055a7a0f1855d468c0246f2a9891fb116fc71005b978a6af636 SHA512 324543b6462cb05811240d4646c8c0d56ffbef7f8476d5091a817807fc941ac72311e27b31a20ccf2df894bb3360a8d36b34dd6fcb2069922ba5f3cd6777b046
-DIST github.com-google-uuid-0cd6bf5da1e1c83f8b45653022c74f71af0538a4.tar.gz 13561 BLAKE2B d158ab89d96b1987a79d5ceec74ac002e5b4053a86cf3a3d407f26b27d425fcb11e113e388f688eb181229ca280548f6c3490077d01f994298a5d47ec68258d4 SHA512 c0185645a3df24ed5edff43004194f844b5e67c69b62dfc746b457cfe236b869b225b3d383e8bab161281aa1fdd667d4196a7b0ff81dfa32e3ddc73aab43af59
-DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
-DIST github.com-gophercloud-gophercloud-c2d73b246b48e239d3f03c455905e06fe26e33c3.tar.gz 875548 BLAKE2B 229cfc12ebc179242a04fc5fb80269f2b25e28d3e795a5f7ee4894b6717e9dba8240d5e0b5621dd8ced6809e4f13c0b2919b6455888534ea96d7fb106e9664d1 SHA512 bb6d896c5d830877d3ce8b865be99c3807558ca480e237530152096db3f1c4bf3ea757e3cec1c2206153e3721299f6a066784c7391b701f9de0e4a891e6edd09
-DIST github.com-gosuri-uitable-2cf933346b8370a3a3d8867ef5cf54b2129d8ecf.tar.gz 7216 BLAKE2B 59a08e73f84e424c5be5d811011996bccf2892295c49d658e90ef899349bbee0e1fd97ea6ce46a5fa5d41493a19ee552e0cb27ae0dff8fe47d49045b4c2b2c96 SHA512 151569d9477f3ca2c7f91f80ccd6dd15a5c7461f7918f2b38de5149a419b56bb2f5fcb79247fd74fb57143b74c28906f31ded794e7e89a50d4fede5e092a303a
-DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
-DIST github.com-grpc-ecosystem-go-grpc-prometheus-6af20e3a5340d5e6bde20c8a7a78699efe19ac0a.tar.gz 30622 BLAKE2B d877284cb5e2c544f56f4df5e61d3176da794e1af7c95497e0de654863feaa201dc5addeef0c04cd0871da643a56819466f3da129896befb10625e6234cb130b SHA512 8a3c39803f6a6a6236917a50ca319a7b13097332c8b8ee831a82214dd6b464e35e515c3058faaa0f2223671c44f9b2e0af64adf87f6e9cd1b21518a37ed06b08
-DIST github.com-grpc-grpc-go-a02b0774206b209466313a0b525d2c738fe407eb.tar.gz 590343 BLAKE2B b5f35015f4511024163a968d520f94f47dadf83e5514c24bbf990f460acd1a5389f2ccc015040d889216eda8cadaddccaa94841d52215a114f900c96406daaaf SHA512 f14f19bc116cf465da08244d924baaaecd1676a3ff19c9efc6e3fa5ecea60558826f945adb8b5f1231046220241b26e69247a108399a04de6289384d0636a3ef
-DIST github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz 12983 BLAKE2B c600a2ee072ae86dc080f10232d079f5d0179e4f3ebc4c7db4ac2ef05ed99998843ce0882c38236552ce36ba38898dea6a13956e2da9ed58af91a728a34a980a SHA512 1a87bbb71da395c99b947aa85ccc8e8f680af14d0be3fcaf353bb058ffbde80252ee5dc5186e5a0a325cec0cbb8fd45cf86f3e6d4f8056515af1af4072c49308
-DIST github.com-huandu-xstrings-f02667b379e2fb5916c3cda2cf31e0eb885d79f8.tar.gz 16630 BLAKE2B a342eb5cc38aca4f5a5a5a36295c0c804997550997115b86373b6b6879b0d6faf1576aa0e0b550127a1b9fa477e2fa27c44c7a6be93c827ffb913419ba4792de SHA512 f291b9893795084d081bb6cf025ff82044b2ef436325a3f0e16f6a193e5ab516439895886a284ba45156839bcc643b5e702db7d1bb438b093d91a2ab4999c62b
-DIST github.com-imdario-mergo-9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz 15928 BLAKE2B 1a6f95308897829160a1a61d76fb17fe6da2159ec68a9def1294eee0f7c5acfa0de9581a7afe05353a79088374ebbe8ca1299844666ee52a3074b8a2ed04d02c SHA512 34bdc7ed182a4290862c4c21fd9442e6b3bc03a16aa04a54aede48f16c0baec62478dff97433c6d3370b110abf4a712b304064826589ef922d1bf8cfb80fd446
-DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
-DIST github.com-jmoiron-sqlx-d161d7a76b5661016ad0b085869f77fd410f3e6a.tar.gz 49619 BLAKE2B 69a7ad4e10d12420534374e36a0897aaf9219479a128842455f00f865fd9c15d0b580ccfab2ae0a98a4720b19f0230291d24c773b7c297b9e47306fedf68e6af SHA512 d52c306a0664135d8c6e63e836791ba829daf9cf23c656e8cf93ee258aef5c708a7a83d57efb0b0d78456b3c644677ca25c0dc9960a0a2aa058202f799880555
-DIST github.com-json-iterator-go-27518f6661eba504be5a7a9a9f6d9460d892ade3.tar.gz 77940 BLAKE2B 3e783fe2e4a2f2ae32944492d8c959968ed48a3d0c3eb73c8bdf91533bf09b954452edfa489f0f1e916956c764c07a6d6af8e2cbe2a5cbd843acc0bb0184b1e4 SHA512 3cf5fc88eff6625ef43dad53127c1499ec8edcca864ff4619fa9f1c28a2fa776cc9502afb40e775c08e0f269315a5abd16f939be25f5aac7c19a97d2e2b9b391
-DIST github.com-konsorten-go-windows-terminal-sequences-5c8c8bd35d3832f5d134ae1e1e375b69a4d25242.tar.gz 1901 BLAKE2B f8abd760472e484d1d6465fcedb5240ac104556af67715860c0429b9dfd963441396266f3b1b0af2b6a62530dfa4f8ffef9414561ff64b8639e6eada9efeb301 SHA512 c8445e656d4042d0c31661bfef05cf918e84d5b4905de09553cad0682c83fdab60ed11c0fdbe90949566514125d2353aabad85d36c15825a48e86d8ed73a94fa
-DIST github.com-kubernetes-api-35e52d86657aba06859dd22099bfa14faf1effb2.tar.gz 2540409 BLAKE2B 867f6230cf50a507b284b6e9345a800113c81bb497dfa8becfd926d2159154db39fc22d811448bbc2b812633444c8b262d14ba20395029b6f885f6138f498d43 SHA512 ff48c59fa4aed8e860115303b58f90104bdef4238d7aa6e6393dd342c4b9f3e07c7a4bd7ef6b3d3987cda819d5cc73345dac07fc58dcfde8389921d7df0fba85
-DIST github.com-kubernetes-apiextensions-apiserver-5357c4baaf6562e4d37c9afc9fef99bd16d76a9f.tar.gz 376464 BLAKE2B 0cc999151e2e7fac2e92aae39d051a0a99f2a3f103456d2af803c56ee8d9e8d07027d99d5de50591ba61d5ec9cd48a228542ce1792c867a737172c696b10b4f4 SHA512 430954477f12ba2cdfcb9de5010fea62f9a1e8ac1926f2ce2fe7e6589763d0e44a741bd246e7232554860ba8fa2198ff76e478dbd7fdb45987c4a5f21a5c81a0
-DIST github.com-kubernetes-apimachinery-a2eda9f80ab8a454a81bdde16d62a1afe5f931c0.tar.gz 504261 BLAKE2B 2cfd317dbd539ef44429ed651e939ca4e91b64a2f1bac801048b2499d7584696ad44f4846657a3be28d60dbe2f6814d51e45dc702396fd10efc56440b25c03c4 SHA512 93f3cb4b2be1f81ad8a343b47aa2c10f36f9178f93d921a9253605bf9e12473eae68649976abe6e3d6c68a1a2ddbfa95d5d3b1cab0ec7ef0552dad6169feac9d
-DIST github.com-kubernetes-apiserver-5190913f932d82e562d4eb91d0f3d7a063bdbc07.tar.gz 771653 BLAKE2B 1e078ad6acd4cec8d65df0175afb87b7bbf2a6e43d1e71f3664f4bc130bdb4f6202f20ddbf4b431c295bf363408c425025a150350e5b4804d9419f93eba69eee SHA512 da52a1e61394131281db0fd321ac119c613e01f875cd244b5517f6c3bbb86a5747759f3ecd6a0b9dffee27bf6767661c19a01e6fcf27dfb87e29f6b8bfc1e4d6
-DIST github.com-kubernetes-cli-runtime-74ad18325ed51ea6de9ee19bae59156bad18ecd2.tar.gz 91304 BLAKE2B cd376f071227fda170fde7bc72ce4efa64d49a054d3e26c35119deae10cd63586f513fc1dfea45c354da092ddd13da827152984dd2de521a80289558cd1b6c71 SHA512 25e0d88e45fdfe3ccf3391de5b28f9669723d103dcd90653e9954df7c78a6c72c4c95ee9fb80f617491db7c4f3bd33974afcaf9a28a62282bb7884d0edd0af74
-DIST github.com-kubernetes-client-go-bec269661e48cb1e5fbb0d037f356ffe9e9978a0.tar.gz 586153 BLAKE2B 959255e10caad42994001b1c8e39fc31eab28842ca36a48fffb2b9af5a7751d2a2fe59e2c40c6b13b083e9efca6051f22d04fc79641434ed156f84c06da4eea1 SHA512 c4f59febb8795b36fc3012d3abee4139f8987c46b3d696f540458e994ced5b9b3b2e9609172c77eb411b3cbfb303a6ca576684cdb049f3630d93084d47475973
-DIST github.com-kubernetes-component-base-039242c015a9f5eeaccea3ea17c6973b9c27166a.tar.gz 55170 BLAKE2B fd2a2d5d6c427449e4434f3dbf03ffbef1953294f22a32b005197bdcbef45cca3bb9ab5feb45d8f9e3cf8352764c11f25850376a0d975dcf83c5dc73e1e23d47 SHA512 1a968cccf2e060e9ccb052cacfa67be49aa13bea2cb0152d1833b238db23ccedcf102f0ef66895a9d9a6ef2b09648d7d9ddb0d13fd4ca3730a5bf175e26f0fc6
-DIST github.com-kubernetes-klog-3ca30a56d8a775276f9cdae009ba326fdc05af7f.tar.gz 32456 BLAKE2B e7ec2eb0097378d00a7ce7700a2428e36dd75d61cc2bee105661da7465a08dea3e1ba1070cd089deb8a07667cf39212a604f28268d44e53f51956062061c1a38 SHA512 2f16731f09ba48d2862c7744c700324966f28f9dc5135d6812de29900ec58046b88a1d0402976beede0c55b356dcf1b3612e1606bf0597f1da1dfdb1580ee53c
-DIST github.com-kubernetes-kube-openapi-743ec37842bffe49dd4221d9026f30fb1d5adbc4.tar.gz 739569 BLAKE2B 7bb1b625c74a03e046895f21df2c8364b16109b150dd97cce5a882bb632d51dda1917062348ffd35d49c3d16842608ec50687369823df44face78a9ac78b6af3 SHA512 0ef0ea27c32f56a69c80b420658544dbda82d268a6d4269d71fb597a7e042a48088287580c078e1d164c36d16dc784175979ee55654465cd9e3f2e8070d0a893
-DIST github.com-kubernetes-kubectl-2ed914427d51f6fd865e0db43d72b2f22610cf32.tar.gz 2760556 BLAKE2B 92ca4c84ff5208691c93fd3bb580c70886b9cb2517abb5518a6574d008b6b4aa3ba2fe7c3bb10605927772991c4e176207289e4a20d917dc5ed7be2834afe540 SHA512 6fe4656a9d2d5122116e01ca94980ee3c9a378ee83a2b314b9e50211854ed2db80995f1012fdd77d4a60a5c8a65e58256cbb342ed2409a21cea26bd4a387f9e1
-DIST github.com-kubernetes-kubernetes-c97fe5036ef3df2967d086711e6c0c405941e14b.tar.gz 31200712 BLAKE2B 1e2019dbb270ab37fd8a882bf932d031b34a33a5e39db5c37e2779eecd5e228dc304cf928029d95c01ed2c8f77464b7e237f32569b865532bee498abd03180e9 SHA512 0189f8ee2de8c094676a72a3ba59ed5a77abd489ce583d37ed5b8a9d2e5e118140f38c83c68084738aba7fdad58776b6869edc4cc59368ec07b5d42dcf59d1ea
-DIST github.com-kubernetes-sigs-kustomize-a6f65144121d1955266b0cd836ce954c04122dc8.tar.gz 3437120 BLAKE2B 9eed49b8b5f924c7627304a48307de2f3db386c5817d8ad00ec1f15d6fc9900eb00b16508abee9c4176b3853aa940421d0dc6e9a7a900e4c4cfb85ed399cf42c SHA512 fac0eea0c20ce1c23986e77f6d7fcc783b044cd774f2cd05e50d6088ecfc179141d6d547e6537a0bcfe8d2291c2610bf4e6a1806d6d86eda4e93ae871c10f1ab
-DIST github.com-kubernetes-sigs-yaml-fd68e9863619f6ec2fdd8625fe1f02e7c877e480.tar.gz 14901 BLAKE2B 8403e128afa97525c6322e80fd9810334fa6cb8746254f98877478db49b7eac6dddb86ec4a980844ca1d4fa398d881a8338b80bfb51206017c771d6d4f07c9d4 SHA512 7bc311c2afca9d83af3242f008267e7f7ed9eb8320a55c09fc1d1a0854fbacbf04e38fe69efb8510aab54444e6b1bccb9bfbc5e54630a1cef153ea3caedb4f0d
-DIST github.com-kubernetes-utils-581e00157fb1a0435d4fac54a52d1ca1e481d60e.tar.gz 50736 BLAKE2B 0c465d040112f872f5958997a3e7bd5ce2baaee048a4b13f5f7510a7cf8eb4f1194a04e666dc695f2aca14a702215481a39891e9e15cc580ae4f0ae913cebcd1 SHA512 fb599fa617c50ebd9381f5d208fc1929adf5f44f61c5e7ba4fc46d9771aa985327284c1bfe3b4e4c1ca45312b3643391d8d145b29a93619e35552a30cd627a22
-DIST github.com-lib-pq-f91d3411e481ed313eeab65ebfe9076466c39d01.tar.gz 96260 BLAKE2B f6d83f5dacb2b60f4cffe5211a8ab4c5838838a756e5bd33132501a74e9f92d0fb12600d1693ed538cbed8367df3e8206964b70b12b38b174c0fe6c06b3eadb5 SHA512 ef5204491ab76492dc4e05e8dfcbbc886a92ee614bb65b395cdb6050b208ad0b138d8c6907b7738e648f153e1b1ba2e60976d00960c41f0fdf4a2b34d018ef0c
-DIST github.com-liggitt-tabwriter-89fcab3d43de07060e4fd4c1547430ed57e87f24.tar.gz 12277 BLAKE2B 7c8c248116cd4feea2fb9bcf22d64e110feb6e377c9b2859a5f0786e3949b57505d1ed3d072bf2216a0ca0926978932d60ed84f236d9d2fee26309ac6582c6f2 SHA512 f1aa930429addd014ce293038087c447e44d0f840963b188930cfcac95490ea52df174bb662a0c5d506371342dbd8466223b3a0f6641017fc20d59f7f209b33a
-DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
-DIST github.com-mattn-go-colorable-98ec13f34aabf44cc914c65a1cfb7b9bc815aef1.tar.gz 8980 BLAKE2B c4851097d20f928513ea60eba8119ef0a0878a5401ff46abb381ca39c47babe5a123094257bb0ee7c08b8d9e8df10a594ee1a3e967ffc1c913eb1a941c446855 SHA512 01dd99ffd5152ce8d3e45c3948ff49ab792531c02ba4155dad760a5c5191a0791aa410a7cca7b5d8fe49d8b143d761a7ccfd57f55389322b25aa31f40d638b26
-DIST github.com-mattn-go-isatty-0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a.tar.gz 4461 BLAKE2B c49434cb88ffa87793507a64a4acd17a877beefb7b403ee5524e1046f98511b3846c7b3a4f021cc33cd2804dc30e61cef83062f6e696579eaf7851ae51a8fb2a SHA512 fdd8ae0488ffc2a1a34f12dc1781c39c64677c5970fad6963394fef2462ac17b081f77d86cff171136f89016be5a47ab00d4242c58725b8bff6b1f554b58a58e
-DIST github.com-mattn-go-runewidth-9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf.tar.gz 16016 BLAKE2B bf9413cb5774e487fcbf4d1eacf958a3f94a564d6b92df78a296c4a2a4b77e294c9e1c75ef2c481184563386f9294663a4d1aefc6a4bc8ac7878cf2130534de0 SHA512 8381b910c16b79661aeb5109a48ef1a3cc1f4eb3fe2cb4940ef23c0b9576258a59cbd163977aabc82cf103c588f33fae89a83dbb5749bb85a94452db8acb9bba
-DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
-DIST github.com-mitchellh-copystructure-9a1b6f44e8da0e0e374624fb0a825a231b00c537.tar.gz 8905 BLAKE2B 832bb9e9d51b2549a1bd83c85d4d9eabd0aeb32033304f8e1c6f487d0fbce1b252a2546bc35502df9f15e69097f35be601e98d2232607527b70f1246dc280f8b SHA512 932a1c50185fd1ff78636d004c4a4c8e7e69253a85d439a0775862258963c5d0b1ad4ffecdcce84ba61d01060ffc4f8f142d34fce73ff7c49c0f05e3bea8ddad
-DIST github.com-mitchellh-go-wordwrap-9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c.tar.gz 2785 BLAKE2B c049e833101c330e1c153b212e7a98f02be90333719d1ed5557f1ff52f9db9e82bcac942fdb2b6206c8e3ef5f5dda6b90e7f2b370b16b45c69413b0f93597850 SHA512 377d539b68744a2b03e9fa6990822fda18103854ddc93eeffa4d635864f44e00844b4bbb48b1d4149e6d456483337f357343fd806f9b150aa319a98a773407bd
-DIST github.com-mitchellh-reflectwalk-3e2c75dfad4fbf904b58782a80fd595c760ad185.tar.gz 6446 BLAKE2B dc51802649e0c6f0ac20e3eeabd0b00d6a390d25c7a3be434cc3f3df5fa3ec21e2151ee7917a54e3fb675426413b5767a150ff79ee6bc913a967f7309aebe88c SHA512 357cd5283bfc5f6f1be47bd732caf26951775eeca233e76e9118da2c2a6f59b51613334e7390e6ea479af2d3fe462c711b8567491e7246df0cf9fe512001c784
-DIST github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz 7527 BLAKE2B fe191bd398bbd1beac3de9a69b54b04e01436347f0f8933b8eb189dcafaf3d68bb76d6d738f5532e5e9d8e1631ef4d3785a110b69856c4e11d811b80dc31f19c SHA512 bca1593dea7cd004a0191420ccad56cffb91bc5523434f50920ce25c2ee82dc6a756e2eefdcee94ae0bb403fea881e42bf403d6218d6169f30dc9288e72d1c36
-DIST github.com-modern-go-reflect2-94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz 14404 BLAKE2B fcf261bf39415ab06f03df46887f6373386007cab1c439733039a00eee7f3d430323f1589b422c458435809c38039d4440a537845ed0e4d49193b1448cca63c8 SHA512 1e622f71b935169c463b2cdb970c6f9c142e746a40daf760430f6a24a1e938a905d84793a7ef241a32cfcd7cbeca701714b69791b2117c46fb90490c39fe1ecc
-DIST github.com-opencontainers-go-digest-279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz 19205 BLAKE2B 752148dc0119bbfe1c956fe157b205e25fc4cadc71289bff0b3c4fe12a6ad5d8e555d0d782df33172a3619f022ab2b698c1671eb05b0ecc9e500e9829584ce46 SHA512 2a3f4eae058d7379be5495f2b253990dbb59bbc394b5cc2adb948be41e1e4cab76efe388eb9ccc1cb30cb51e0a9d9cb07357b6e24d07afdd52aa08a77ec8e01f
-DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
-DIST github.com-pkg-errors-27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7.tar.gz 12294 BLAKE2B b25f0fb276d65047ca0fae8712150bb4f5e07b597f5a297b216eff8f6b0a3a25e484d72ff683494a48a047efc699c03c34a8e05cfe6caed5670ce82e74f9bb15 SHA512 361100e92b0dc27297ecbf1d72244ef2859456f37830c510a2b2bf39a277e9647c808ae70682eff7bf037c1e23563312a6e0a060b49e60747d1659c5f0cd60f6
-DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62
-DIST github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz 57195 BLAKE2B 08fa9bf28957a15e543e2d86e5a19fc302f7ef5284796d6dec24c182ce7a3889a5bbe53d58fc018cabbd0bc717b36533043c3ccb3e3355d8434fa7e3dd399b50 SHA512 e44828e3790282e088bedd5c8786948192beb5061e8dedd4f0b2508e31f641569c2c2a7e3899c2eebf4aac0c0fb3a22fc9172e0460fa2372fa876e23807d23b8
-DIST github.com-prometheus-common-4724e9255275ce38f7179b2478abeae4e28c904f.tar.gz 80876 BLAKE2B 669ebe88636632ff26229b2e3ba261cd5a35bff4586df59950637fe169802fdf6e1fdd7d7c64fa6918aa26cc5dd196138f13a87dba7532d2e84ba2550bc5b705 SHA512 fe1895ba4410b326c80aca9cb97614e32daedc2f35af4a32b502a25ad3f98d6e47ed1b12c2066a8ea9eb2618ea60e1ee4d4b423e48bc337b778472c3897ede05
-DIST github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz 61606 BLAKE2B f67de9c0f3e8d814bed1711f0e0771c13e7d4d8d9dcc67ede3615bb80f8a8f20bbcf9ef65e46dff4a41cc587ef10ad54ffdb6909fbe83f19993422ed5714dd81 SHA512 8cabd997ac2405fe53aa507b6755aff7aa4ae2a1fdb3711abfac5d29bdd369412a17359c3d9c3ebc4945d1b6310c2fadd25201ec7b040b20e2ac5d27b56c564b
-DIST github.com-rubenv-sql-migrate-9355dd04f4b3dc9ed604623307307a3491a627bc.tar.gz 22615 BLAKE2B ae7b38054b394be2664e5b5001d8d718e83d1eb5a691dc2a76d37585f4d39aee8e56a822bf9162f9a717449f0df62ae5fd267a3fbfde3d2681dd4b705e1705db SHA512 104a21a84b8315f7ce16e41b587c01f441bc037e875b6552137a06c580e8ed2b2bd724bddd5c4edda7d7a259a1c55e866a342873467ea6b779c8b551c3571c19
-DIST github.com-russross-blackfriday-05f3235734ad95d0016f6a23902f06461fcf567a.tar.gz 75898 BLAKE2B dfde4cb8b2a7c18643926ed21b46ca0af43ea2302b055b4d40715a31cd11d398c1404db49a47703112e536a96bb2b05525123b4e197197e0b41f0e565c912194 SHA512 e6e442a45835e28ffe58667db018612862c33528af0c2e4aa3c1e4a7e89c503e59b004d42df76ccd4619a998d1796ffb106db20e0a01c8932aaa9f4175fff2c2
-DIST github.com-sirupsen-logrus-839c75faf7f98a33d445d181f3018b5c3409a45e.tar.gz 41379 BLAKE2B 6f33e420e837503679f0b330893d2cbf63751afdfcf5a1b9679d8fbc06ce6f0c9ef00a35d2be16a128513caf13d9b75830a63068af89fc5baaf92c9a45398b9c SHA512 606eff13fb7bad42f64b0f42d56eaca8a83bf9c1c88d69f5497f72e266ef177f3f36697bf60c24526a31a8c420723db26ef41de9b643f305c077ca1300779664
-DIST github.com-spf13-cobra-f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5.tar.gz 111260 BLAKE2B 4ba7f888257cd5b883379d9bf137872b1ecdaee796ba7cde107ef7e85d1f55d45b039dc7d6e7bf170a6eeb76cf8a56e9a60325284f4318397edbfcbad5ed1bda SHA512 c9b210a7c08e96e66b14c03d8b4dc613092eda22b647f56da597d329203b594ce6358f34a2404a41ce8070250721e18e4defb7aa70fab8b3a6bc7ff81291f02f
-DIST github.com-spf13-pflag-2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab.tar.gz 50880 BLAKE2B 49c7ffd77b8bb294ee5f35a9d0fb1567dc740723c7e7fcbfa54365ef1d4e91006032f3213771aee55b35eba418bda53c9da27da31ed4dbbb81a0987302883591 SHA512 c579ad91387f90e6fe630d9711904d63dc8b4fa71d49aac83d5e6489e5150f9d6c8aa5444bf5f2357f67eedab82bd7f32ad00975da5267290c8957fc416a904d
-DIST github.com-square-go-jose-e94fb177d3668d35ab39c61cbb2f311550557e83.tar.gz 298098 BLAKE2B f9641af6620e68187360e8fb370de2f0a76e263662e1af5c039bec94c95894beea1d2af99b4ff6b6107aa3a504d137982ea32923c955a9cff4c5b382acdfd386 SHA512 f04896aa0c3a4bca3e435bf6d5b0f8968d21ad0bd06ce87f77054914a724cc1355fd20ce383a517a6e433362b9ac2a1f07f12fbd9875cea6f6736bb2f862187b
-DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
 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.5.mod 94 BLAKE2B 5014c2a8459f1f01661c7cac0a7d2ad7de372b3e2916d56d721fd454e459fc75d5b4f6249a73dc54b46b91df00b1ef5c3d47d099fa28429a6967427ec7bfb36a SHA512 d3cfb7a75e321d2a6fc145b727dea76002189ae2caa8dd3162e5e6903a1acbe5bd55be81d7f112c71b47e61351534ff991be30993632be9c9d7443111600fe39
 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.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod 2438 BLAKE2B 8697edf8181b20e91953588063dd1925416f2347eeeef5b5053393be4de74da8209524eec829b741d8226c78ef96708d849df6ad4802746c6c74c645a314a152 SHA512 10b1a391d11781521e2070e7ce2db67cca9f5c89af841d9086e28aee731f89772fe92a90a188b72cd83b126b5846a1f905e87a04311f7777259efe44850b25cb
 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
@@ -836,11 +800,13 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BL
 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-20190325154230-a5d413f7728c.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-20190617133340-57b3e21c3d56.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190621222207-cc06ce4a13d4.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-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.zip 1859245 BLAKE2B e33051036e462284bf672b92f35863014e4740917c856eaf5aeaea6530dc5ff77fcbac4d797aeb8131cd013bac525e502e582f7139ccea4d3c226fdcff83ba0b SHA512 7c0734618d52ac2f0e2fe9245fc15208d13f05e6ab3e89b4a76bbb94e2895376f3d5a7d71d36a020c8861a0ed94a344a534f4d3b6bd9003d153e4e4b80abaf05
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
@@ -850,13 +816,27 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.zip 18729
 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%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-20191227195350-da58074b4299.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+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%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.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-20170114055629-f2499483f923.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 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
@@ -873,6 +853,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAK
 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-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
@@ -882,10 +863,17 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAK
 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-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-20200226121028-0de0cce0169b.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-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
 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-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%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
@@ -905,27 +893,44 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.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-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 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-20190515120540-06a5c4944438.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-20190616124812-15dcb6c0061f.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-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.zip 1837462 BLAKE2B ae87037c165e15d3a17fb2c37b59faec2af12dc9653ab4bc504f8a283679d7599704980971e8d0d43235b723f67fa8ae3d5f6005dba6073930f4731859f17416 SHA512 a5fd196d6476e16cc864616cfeb62d29a96e1132e181a261940639918fb4a8452cd473878bd8fad8ce5b269d3466657b5aa2e7771e02591f999e98eb81b55957
+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-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-20191220142924-d4481acd189f.zip 1914335 BLAKE2B f8ce8e4fe5abba2f3e750a752e863563f76a964fb385cf75d923e2a0d882231f1337471efeea6df83c3830085f8a35cd535f149aa61c670c01c7ef9c7ef492fd SHA512 42c694e39947304cc0bb0977a0667eb115799566b069e3b011d29a6e72a0324e1f8e93aec6282d58e2ded9a6aa77e016390c3202bd8a9bfa646af7f6d7030e26
+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-20200202164722-d101bd2416d5.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-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-20200622214017-ed371f2e16b4.zip 1479021 BLAKE2B 871ef0085bc9e5600f7dad363d19fa336712c924a07b177e05e577c01eb165dd4fe6fdf8288de4a5a4181e026b56c5da2008d39b136dfe03f415a1e5bc8824e4 SHA512 5db5145d3a2b3a504b29f2ca33ed8427c78786b47b8e991a07c204ca8a67d3c213bb3c2c44ce7fbc77626e7e53c0ed8ba24ea315adfeed47d6a5bc77c55c9dcf
 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.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.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 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
@@ -941,28 +946,46 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.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-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-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-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-20191004055002-72853e10c5a3.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-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-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-20200616133436-c1934b75d054.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 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 google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
+DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
 DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
 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.5.zip 417678 BLAKE2B cdb4e693ed5fb2bb77ed1ce0e0b1b25dbc3648c00554ade874ce28fffd5824f487fac744f9f2cb0920aad2c94a82024e1d233d1663887f0681790488a3af6f3c SHA512 1ffe3894d8fd004f6c28916e06d8e64708c20321ff914e82d05c50ce4c62b76bcd93e74e45871f7adc779791240ef8e25df08fdaaf2abdce20a3640d8964bb28
 DIST google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod 31 BLAKE2B 679418ac9c2ad45dc432c1fb2f8ae13482bcce67e3d83f3204380a5fe8b69ecb6f19114b8e10656880a434e012712ad94bfe3767874d88ac64960d86dd5548ed SHA512 1ce907ff4c74870bf960dc786a8a2d824ed8794c433af026bdb4fe29c40c0812187bd409e3dfb99bb91414e0ac5f766d3cfe0badfa6e1ac4a3e54de3f14c40dc
@@ -970,27 +993,45 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod
 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-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-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+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%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
 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.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.0.zip 1141475 BLAKE2B ec5a9cbd45f90db7991979e1b25fbdf13f242cead59116a9f5703461f0b2d20b643edf61b906afa54a6b730cb5a1be4483757c726c46b571dbece739610db041 SHA512 687e9528375d9b87ce91eb5c67b22d3a1157166c753f729e4d6c0d3d7964d459defedfe09e8fbe035e49d432130a7029432cbfbf6bae95cc560e715748d4d42c
+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.24.0.zip 1510578 BLAKE2B 71a34f94325a05f830fb7fc951f43c7328fdcddbbdadf03f6e68baa84973be7dfaece317c77fb25bddbc3079f3960a5026ed81fc0ad7d83cdaf224080a2ffc17 SHA512 119be6e0aab9487c1340fdd4c73b57cab4fc74d2290430aac19f650c2a4f56ec34f8eb34c8a87fa267c979e5577cdac72deacfb6d2b9a68cd8f33e19841e0c9a
 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
 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%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
 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
@@ -1018,72 +1059,104 @@ DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
 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 helm-2.16.1.tar.gz 1283836 BLAKE2B f0a2cfb05adea2b0a98341962753e777e9329b669ca32a84ce0ed9b823df48f7884c6809d1625dd8cdfbf50efea31081c3c0400f0af65a67ab0fbf1afa3deba1 SHA512 eed2da36ba72da61c121d2cc2d4dc4ef2163f926579b2189b8b8113ba70102d0f63e48729e08b260fb3877d0fe1e0d6ed7eb8e9c67605d7d4a3bcdf7b33c2544
-DIST helm-2.16.9.tar.gz 1289259 BLAKE2B e633445c51e762762916e10df15f9b5d28f5e9e1dd84bd30c041a37aa4e06b5427657ffc9c62fef27e194694d98335c601cf855f980b1a89b4a44048ae13b0c2 SHA512 a30a153419ffc3bb7f7bc3f17d7a29ecc9789a392e2117c03050345a73439c2c0f1dc53b40f67ef762497e08912da0b21b95f24d548efd5615ff1aaeca08a101
+DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
 DIST helm-3.3.4.tar.gz 635362 BLAKE2B 41c6bb96532ef23738c7f5defa08ad819a9bdfd57d2270e150f5e728f0c5db6358edd318febe4d348c5a50b1018519c48a96403f1e0442897294dcf45d7df3a9 SHA512 9ec2aa5f6c30f9e705c812be77bac2815586ffd430d1316d343ade1048efc84abac603bb0185b6dcfc66029a8a5398c3de945830ca39d2415c62c4b7ea0c678a
+DIST helm-3.4.1.tar.gz 655551 BLAKE2B dd6c0bb4e290dc0d87eb02f687a1b53a66de8661bcb29821a004982b9157c17ce992858d4e28522c4ad5f187f097052011c18d3500ac12684d8ce611aad10cd4 SHA512 08b86c55472e22904383770a82104fe97ee08b800e08028c20bb599e133e4eed721d024357d7a40b826c4481623ba31844003279172250a055a10fae879d6cd6
 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 k8s.io%2Fapi%2F@v%2Fv0.18.4.mod 475 BLAKE2B 81712330f911caf684e74b06cecc63648144a0d2bc91950a2adc13b1f9e56552cedcd9f2c5037e07cafd731148208c4831f22d2cbc2e6cb2a18523a786362dd2 SHA512 7f587e1cec889ebd84aff04e12427d02b9857ac21b30f94840767213b2c4c57a31f7541892b1f30ddcb924ebe01aea18560b7f0ad30f2abbf1d30ca83e2b1226
 DIST k8s.io%2Fapi%2F@v%2Fv0.18.4.zip 3442467 BLAKE2B 0188403b1591d893a24680bd011d7655e7a6c604a8e949d8156a68a3d4285567ba1de4d6da2b34b6f9cf90204a3c0c1d5c014004852bedef9eeaf1f941a4a91d SHA512 6986f62c1cb18c63d7b7c2cce8d835766f4f8390a678e8ae536a1e0a99cf52ce822dc92368291405a4a1943451d1b08bf13b62dd3cc45d131bb309f6d7b3bc12
 DIST k8s.io%2Fapi%2F@v%2Fv0.18.8.mod 475 BLAKE2B 7df31be842b72773c82d8035fd6b233c1f273fa93087bfae4266900bf8fa689cacd62f235a183e41d9e02840384ae29ed7d7efe08cc678ce2d9e16df58bacc16 SHA512 0e91630eaea0bc95248354f0ba7baa28eb645eaf86d76c8ba508c51eb6a536a61c9c2593deedfd5ef8546de9a45b555038cf841b4d26e3c1173089b094ce2c6a
 DIST k8s.io%2Fapi%2F@v%2Fv0.18.8.zip 3442597 BLAKE2B ad167088f4423903c75e820cb37ab19549d3388dc7ecc803bd63ab223f02ffa8b84704cde1b83855b6a217979cc7ad59fb16e95f42b35c89030483fdc1f12c6d SHA512 937cb52c1c5d95a0f47cf6e3ac5a01e51991a8ecfd80352aead38e8d924234f35d5fb6b577be8f340f9f7b070f9f1fb9583d93d85eb3faf7bf33f4555910373c
+DIST k8s.io%2Fapi%2F@v%2Fv0.19.2.mod 250 BLAKE2B a6bd00134bfb5ca1cc9aeeffb7dfc429c4b7b76e9235c2c221a760b7ab6f0aa2529fc87ffdc2d10b53eaf01a52146df35652ab15604a7148138a17a9555f7055 SHA512 a337783c7390317754ff44b3738eb9cd369b1d25bc4529ca68b93c538f236f6ebd5da40f0eff430ba5551134cabea03fd5b27dc1b1b310924a993afb67585682
+DIST k8s.io%2Fapi%2F@v%2Fv0.19.2.zip 3838024 BLAKE2B 1e3dad2dd433b9dd49814966320f9a7a1e437a076841bc514f04410e8e5cc0d46d2ca0c15555586d36cc2bbe39d54b67c27fa7e69556e96f6fc978f9db091995 SHA512 a241480631f08eb6c12e47d548e7799c46b5283624094bba2456b55c67a13b7b053008e4bafacb8e0bc0abfb3855e96e094454ed1ea19a514860c21dcb63eced
+DIST k8s.io%2Fapi%2F@v%2Fv0.19.3.mod 250 BLAKE2B 66a92834c1de7a735b757517b7246302b69b3e89ab7eaac0b2501dfad2e34de0effa1b58cef23fdcb6034533a933f5cd680a6942719ebf838860d97fd2561549 SHA512 b328833978423f9e6eeaa8817c3d3a42105a4c28cbb479909e8bc7be5d762ee358f95da22a20f408fcaff432bb30d2760f834c44b121c03ff75b520bdecc6641
+DIST k8s.io%2Fapi%2F@v%2Fv0.19.3.zip 3838034 BLAKE2B 9c213ca11c75ba980ed3d531cfc1dcd983cbfb05deb494b4759e430c11d8b8c4cc09138eec6ad39fa96ca4504e61e2c9d184c973a07a66a4fe6fa5c717ca2d17 SHA512 aa0b1b6e433a61ad5e562230290799ecdd914fe252198ecfc5a388f55cf9a751a58903af359e8f31da8f5fa3398581d202e39975ff04464dad559fefc258f948
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.4.mod 1543 BLAKE2B 8b5e7767dacb9d2307101bdda72033a9e51a0792d9307ea774d5d7f35d47ca086885824b059091e9cc2562d82875bf0a4715f02af51af6c58bcd8ca67895ea45 SHA512 3ead818938e51b764c54ab2c47cb2120bdaab68941fea5d7a23959014ec636f8c239f10a45b5a74b74501f2ebc686761442ec005abac667eebf777de06ba3a2e
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.4.zip 604313 BLAKE2B ab486857e6e979d5cd760a78f82f794ac40f389788b2f13bbf866c35da46dfb6cb428e85fb1ecc23c609a294612191b3d77329a1119cb06ac4f7ca9e4677fffe SHA512 57c7e0af981be6c5ca086f133b736c8115306a8198730589c16de7cf56661dc805b736be3b5e8c5155e01a7fa0a3b960c522ee5e867adfdbf973e1cffe81bc6b
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.8.mod 1543 BLAKE2B 5c29896f1e76958abadbfd7b0ca85376ec5592c2d217bbe078a4d6a96969d8335e259cf8962d7d709de2a738b9258c5d43e23809c526fc99692e8f196995c613 SHA512 e43b1bb4ebeb2c41d1fe8e82e73b71e071e08204b7374f1a3179264b962570da7d75a147e45c41cbe1cf2578d4d72d39e6cf98c6a3e4ba926d6cb0cbf5869238
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.8.zip 604397 BLAKE2B 0cd2b5acb7cafc6e37e6972b127fbdaaa9bec14d734ab0e0a205481c590f15496c7271c28208e830ce5abab91ddf7b49dd1d8826a20746063070ee9be024472c SHA512 8465ab9e7995ee316df99d6e9330ba17724303eda0786c587adb5ac058604961daa78d72a6a11b480cc98f610c64baa6a8da300aa5089b29ba088ff337ac4af0
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.3.mod 1320 BLAKE2B ec0e6c11f482b1dd74126512db40700017f1562cbcbd7aa222402a18662d1ddf21b36d6cdb364c38c0ac3131ce9acfb11df04679f20d02784bfa8046b3e7de97 SHA512 f5405869c9c40dbc4903f13f814f3415199919e55c25233535e91cadc10b772bb79ef2b39ea70c589639f1c011f86040adc8750997c73da7e9b22e319ea70784
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.3.zip 620174 BLAKE2B 2b78aa7002e956689367d39e3cfdcc33f342e8a598b82eba407663934c89b2a020739161f6395deebdaedac263c18b212d2a2677f833627dab5eb863e0f1e3f7 SHA512 e3a07f1707aeb6e158779c713c61dbb020989dc0fd0b3236e3f20c964ef99c4d2c8f5feccd03f2efc5e9170d628a37d8bc619523ce973ebc789ce7023412955a
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.4.mod 1621 BLAKE2B d900a46836b5db1e3fdfc0cdae750be578f87c9ff2628d15d6438efd04966aa45937d0b7cc1ecec59d3fbe5881a324d2483b8a1794a14fa7d099a75084ad7e8e SHA512 dfb42b8cf1147f96a726a745be420a2e3279f53b72accef3766da6d591d0f217fa620af2d2cf9982d848bfd97a150182d60ac58304ff59b7c8b3ce3b31459137
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.4.zip 782976 BLAKE2B 2fc2d707f3591c1d8967c79b16e4ba28baa808d9bc7648371f846c3b27f7b0ac477c0fcdaf136a7315ba3dce128ae598f7c15a48f43592986d9711ef6881f62c SHA512 5f3e21eed6f05db299a30f8f204e2a4ca98e62166c9b232066e8f34ef263f222564a1e2a2a07ed8600ae0ca41a8f9d90678cccf6258377d4f679d60583d2a084
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.8.mod 1636 BLAKE2B 39389c6a705f0959a6661a1732962bcaa47e39c88e1365265d65745f40afe28bc8fcfbda2f756c3cd801f56e54acdb3fbaee31267ddab1823f8121304b146f25 SHA512 cfac07e354564a8d737dcaf549aa47c9b96293a867f25f9a9774451435e5504392872a7be93e441d256c73ae2075b822f0cc1bffafced0af62f4cb5169e913f6
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.8.zip 783417 BLAKE2B 51655fb7fc8e4a759e5cd48d5763aff29bb3f31bb19163ffeef099d345e20b6aa07e90f416f8d39350b82a1d1101a6a92b8b9b7ca64929e0ba8cf27beb4c457d SHA512 80877134b8cdaef32951c832d2a2d4c287003b0c3c816ae6538739d29f86d204a6fb0543ec9b3f2c06de79c7b347e3b4eba58ae08705fb1ba474d5653a21d5d3
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.3.mod 1408 BLAKE2B be74691cf674c89144a34225010441b5edb70d19c7fde8a12cbf6980f5e9df1c722bd7ed7e70b2f9e9e620d989ff54dcd64931cbafb14a679dc67476f67bf05e SHA512 c46a5eae7bbeccff1e49672a7ccd85a9e66ccfb5b4fbc7760fb663c92be4f7b4653db0a5bbed300a8bb196b5ddc43c81b163807b6a83c866c0e82dd74457df00
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.3.zip 799731 BLAKE2B d09b48f808b2ae12b907b0ef7444d4196be5f7bc3da445afcfaa44598bdbe4673e35dc2a5c4f3320128d77a0b0da0aea3829503efcaf0a0ef06e43402bd0e69e SHA512 de9f350bd1904cbec33ccaf4d8f26d609fb32c07467a34a22ee19b59321d89e6f251c353a982c82bb13a1cf7a5364c1c729f05b2f2c49fd66b95275a1779ef53
 DIST k8s.io%2Fapiserver%2F@v%2Fv0.18.4.mod 2647 BLAKE2B 60bc4bd15addde6f39f3eb29675363680412eb7b59523b7399bef716f97f3749159b34a47115a7cab2a8b0bd5bf79dad6b30a2acd973f1ad8c59056add9bd941 SHA512 2e05b765d5ae7b59c00939e38803373ac32d9e7f883ebe59b00d37e6524bffa7eb3bb25e9068def69f656b475ac428e5ffcf01546529bcc927d8c92cc889a4f3
 DIST k8s.io%2Fapiserver%2F@v%2Fv0.18.8.mod 2662 BLAKE2B c9a6e7dce4ebfdc7d2221266e4901d59214ae2bdb805f89e301e61975ac38c0e330c46d3b035d2b651905c923077dcb015f71ac23790ffbdd91a7b8d91d52246 SHA512 991f184242d84c5d78fcca49067076a84358c1e2290d3c9786f218cc56bb44a59a9cc7a58560edfe9b07fe8696f5749b3f0b095b0f13079dca7fb9f9b88b5758
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.19.3.mod 2322 BLAKE2B e760dac815e2b27dcdc088267ec5de367db73ff4be80f2950b240eaa69cf0d8ee2286fc20d6e0be549adc3a24adc43d75c0b8e7ef28050b7432f37135523eeda SHA512 7d89bb477bdfa31966df56e0da970fd9159ccbbb410c4c602164177fd90834985666e285990092976c8bc0fb8ff88f55b682f490f81b57ce077bbfc5603aeab9
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.4.mod 1307 BLAKE2B f525f1fea05b26ef69ba1265bc5ed3979ddeeed48486069b7256f1c06f96427ad11d8ff2bc4e118b3e4bf8969d44909ea4643249c40ab6628ba2e3b877797ebe SHA512 a77a071d74ee0fad326c1c8ddc090250566dd472ed1089c9159af10ddbb1b4309f2ac45f8b66484c2b8242b73413ff9d547cc50d12a9bda00d7d314a9c1a84d1
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.4.zip 463311 BLAKE2B dd723eefbed0139db31caaad4da657a6b8461b95d8573746ecd58b657458f2d132167d31b136145b6981181f05d6b46f78cbafd446a15223c0096bee0240cec5 SHA512 ef139627071ff1ec06cf5923c57f008a2a74347064e380e1a04015e3ed6a55f7e1f219d2ad83612e769c48f7946630ec84c939fe69c6943d64385ce03a8cf0e0
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.8.mod 1322 BLAKE2B 9b8ce22015f21a78737be48c71083efe074107e7b18037aa63a1f208f0f14d3c26922776ea709626fde54f34a7c3a0071271374b7d48fe2c7fa1f70c7fedbcf8 SHA512 764a74b8ea1912963dd7b4373cfcc0f8ab54700416578e5df9184bb672c1770aa4b8185c2909c999a0669416483bd6da1ac6b1e3c05c4197617d93da15c81246
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.8.zip 463410 BLAKE2B 0f0c4331e87e7bebc8fc4d6e6b39ab0262113c06ba99523fd6bbb15e9359055dc1d1091b446122cb9e0fa396a1152b32db2a08c37f8e9dd9d22a3d8a17fb93c0 SHA512 4e9295f3831fb8b45a2db0b5d4cb48be5ab49d492eb3046ffedf9601c3aa5967612d94bc09e1be8cde31422e9c3a1c2a04aafe818112f05d92329d47437283ea
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.19.3.mod 1028 BLAKE2B a9fbec797f02e6f6225a8292655df449f2f7b526b499bae6c0ea400705cb8868eece215f71db148ab98d8f6abdaf92841067139afb6d53a2b32a7d3624d4797f SHA512 08391e4bb3caa2a1b56376c8fce30aa57949e6fada468c5ba2cd79256d91b5c8d53b218c8de8636420470733fa62c03875bc85472b5e1b29fe05b73e398aaa6e
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.19.3.zip 473337 BLAKE2B e052a309f74e074f5b7554f2a37841e109c68629a894ac07113463ffaf5b5be195587b199df6e1e8431ffb3a7297581226167d3a6e3ac79b7079d3719cf79398 SHA512 379a3bb12b457ca92b4a1481b472b2110fb5ae4fe167b4672008dd45d60c1268ea0038503ed26ab4e814ca2d34a0fda458645f67f775c5e3c16fe39460571aa1
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.4.mod 1591 BLAKE2B 2d7c4d51da9090c8ea2507639f519946375fc3e63de1fc451f699c83799c76f43f85b3992ed44b0a5a9e42bd85b9d559b68abb3a41950de9e9012f4a281d6a87 SHA512 2e4fdcd447d6abd2ce5145d9b157267ccce27b52a83e7e31188fc25cae6e853c7beed3a70345ce0a21ce65f13d0644b3432d796e822f9276a49847758abb31b3
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.4.zip 2145721 BLAKE2B 72ada14492290c2ec710330b0fa45e470112d1e666eea75a968a34755438eac46775dd3bba2d31c0a90b3ec4a8e7660c095e32f503d4113b4ffb113d7bcb85ef SHA512 b938bbea89a9aff0596b26d24922e03f16bce963fe61ed612495bd2a0c40cdea72cbbc53b42045f8b5a007d9c4ed95e40f1c26b5de69d72afc50081bed8d501a
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.8.mod 1606 BLAKE2B 18042cd13fb92c6ec2324434c8cd21d77bdade496eb928b30354d3484c8da81e3babe1738d6ce805b8a09a4c275db9573d2e0b9ab15135260089b3646849ee9a SHA512 218fb1280d6188c581174f1d99c21755afa2ecdc07f520b5a87b7e836041cbb1ce2a2576af89c5e6164b3984bfa2fe3b04d77555a58b8be3eb718e2fb3f266b6
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.8.zip 2146391 BLAKE2B 680b2547daa7236b244fd1784f3cd0483edb15743fd9a01946a44444cc499638429ab3836fa74a4eed51924402fad43198798becc39ddc45895ed203f2503fd1 SHA512 5c3347234f3a5110ae80c9264f9310f85435d885cf70534a18b632d64e9d7f62b4a7195e52d039f9ea23d32c8bc945c11af0e07d4776ad89464f9d6af5b9fd64
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.3.mod 1272 BLAKE2B 84cdb0966744deeef8500c2514ca8fd3b5d98a65e3b1c383346cee0b7a05b24d8aebd088d0dc3039e0ff0c1ea67cb91758cc4456c24cae6bc4bdafbebbabc3cb SHA512 815a14dad481cb63748eef26d374054a4aac284f8d68a67601fac11db5de108f4c1cac40ac2b50609a0c93b1da55d41a2f707d557480218cf9e3b0002282fa42
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.3.zip 2193475 BLAKE2B 7900ba17b8bc9921485a0c8caadf969c363fb9d24c8d12553bf21a291ffd9f06e4517f4906744d5457e5193c83e5a030a4f39d7ac9f23987ec4d95d63feefa8d SHA512 a48e4a2f2e93cea912af5d740055761b0109956878e93d61b06611517d86fb78b002f488271d213b05077140bd62402bad4f2d7313ef0fde7ca3c06ba1d98e84
 DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.4.mod 1067 BLAKE2B d3133c2596ababee5cb774ede5881feb974f36d62d58be14e04e2d3652b29d9f0fdcc50373c0fa1068cdd2911dca89183615fb8eee8e181ad45e403d5846565c SHA512 c34e945b634e8cecd22b140b8cf244648a5fc40057950839ead1fa609ae9e1228ddf94bda68c09f79f3e84d0df137e101fdf800b5ac65a57a208d6030225d621
 DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.8.mod 1067 BLAKE2B d3133c2596ababee5cb774ede5881feb974f36d62d58be14e04e2d3652b29d9f0fdcc50373c0fa1068cdd2911dca89183615fb8eee8e181ad45e403d5846565c SHA512 c34e945b634e8cecd22b140b8cf244648a5fc40057950839ead1fa609ae9e1228ddf94bda68c09f79f3e84d0df137e101fdf800b5ac65a57a208d6030225d621
+DIST k8s.io%2Fcode-generator%2F@v%2Fv0.19.3.mod 852 BLAKE2B 11f881c3c0d6b9ad32f82a2ea0fe73bf26651598006815a995b6f90a25fa15bfb9fe2c48d4718890cb558fac0ca6751e24231d89cd41c7a5357693808d8cc54c SHA512 3dddfe73f05ace10bf417aff050c57bcc8856b0224e8b745c4985e8f57b8b5c86d769030132d13d89b60346654ec88bd3b35fbba67ed15141dfa8ff4c6856847
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.4.mod 898 BLAKE2B a0dd888b5fa55c00f88a97e00aad35febd63729d182bcc402d631fadfb585c9fc7fe25b24e0ea85085b37b69a54383de9bbb90f7acdabd25c2840b2ef44094a7 SHA512 73cd415b8468c8c5aab4881a535ed71a4b57ababe633e7902b3d46205adb3486e5930b87b7528f418a0387d0ec2ce01d346db9dc75d74b52cf9d8fa89d4e59f5
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.4.zip 146591 BLAKE2B 8d169a6ee42fe3b0e5c12eac7fc7ea0ff765b68fefeacd140a5409fc6e675963749a8c2073ab11043ca2e6aa6f7e5e60cfc2f091894fb2026eee18a6705488b7 SHA512 e33270544be0696ac4d8c1d800620bba711f639bee7fdc91b86d064f6d2203036d1346ee3823badbe2b65274634553dc4358d9c0a77f67e6939f036fd2ebfe70
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.8.mod 898 BLAKE2B 8e9c10e3836abcb150ed5fc6a196f4479f3b5e49648d2395b18b27473f8581bd4b2a04e1ec56a07fd71e17e74a21f94dce919257652dd232c0e48afa14823aa1 SHA512 bc3f0dbc319926f412587a16c3317b105b7381ee506afcf1e96c332c48437e14ee2d744a7505b1df6194dbc69b8234bdfebdb799fac28fb81deeedf9882b5098
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.8.zip 146723 BLAKE2B 70e43fbf3452551c6cc3bd19f5851147ce3af128d56b5911964dad8df561f9b3bad427a5dce20a65964117367434d7436271717ee91cb0683d1260b4c553d0c7 SHA512 f468feeab442f4348db2b41a994642c6337f88cc404204ac06398068666e61dfb8164ffb1cb81f04a77fa02b5593aa49d89791832a37b2f3425927e6c50b78dc
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.19.3.mod 1022 BLAKE2B 1ad29a3e6d4a0d6059c90bdb52f6a1660a05e6f4bd5682e9a6d62fa419d706ac7b9008cde727547d0b0b982fddfcf1488a3518b7836ac431014bfab49351ba52 SHA512 4484b48234c67ce36f4d9be2bbd17886b2cd07cd8c70fa3a76dc8183141cf477c2023a82363cb66cdf09ba50407a229d4754e1cc82b05514db6b3d0c61df29f3
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.19.3.zip 179186 BLAKE2B 8a669971eb1183bdc1381a567f1e7ec095ebcd5f23d19d703bd95c0697b14a1b188bef0a8a718f60b1574abe333cc3c3bffb5690dba5bdb23c9f00ab095f21f7 SHA512 2a204e3402a9fb122d3206ab7a76fe8d930f6dcfbfdde5284e9c40af11d8a979953a5f88e8d2fa7831cb94adc7038fa6ef9006c2150063c44d76d6691b2ca04b
 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-20200114144118-36b2048a9120.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
+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%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%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
+DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod 71 BLAKE2B 5379c4cfec1c33cee99fc39e4c30e0a83b523474b23c8fb332dcfe3e76463828c559e252a67f19c2b2421b36b5d3f85ab52915a5a959f02666f25bc97e6dbd0a SHA512 2addab12a7cc1ffa4b20d006278930f87efede3163ed08d93644668fd36b1878153e4e9bbc6562b09e2f6637024829199b90e827f94e0874c6fba40ef7d7ed8f
+DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.zip 45140 BLAKE2B c7271958036e25fcaebf47cba48efd18029563731e8648cf0e52247e538b9fec5b3afe74c1b3d071927b3cee29553c8a891dcc1cb920a3a3b17e1cacc8887bbf SHA512 f4adb771c1131f778d2b3f9154e8f855f5ad3882f1a932afc7b4457f9413fa43340e993e6a80cb930019a8e712d40fb62542efb524a2688635b6445f8f9dcb1e
 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%2Fkubectl%2F@v%2Fv0.18.4.mod 2690 BLAKE2B 51b292196f86e2cd34e971e217a723d0c14a770769a98789a5293182b817660c107035266c8920931c0c8d965d3c34612d023bcea688130e5796edc8e05eeedd SHA512 97de40e1362e5ee4e1356e7a00445e965676232d21756e17f589fa185db51865b6430c1c593ac4006d533f0f29e8597dc9011a3d9570df5f625a61c87406cedb
 DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.4.zip 3312836 BLAKE2B 06ab8f4f119eefdb757406a177415a7f6c229cfb97c887f07e656f0e4d1c6ec3c69b35424a99beaa76d6c665e2fdecc6ecd8fe0b846e98ceef44f6dc65e002c6 SHA512 7b3133ca89b38ce895f59de319fe673938bc33acb57a915e877b87e46d206fec750efeb8378a37fe922dd975a5f2d3cda90551182d227491ca921ccb061c8f86
 DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.8.mod 2705 BLAKE2B 176cdc6687ad797a87c0450b060ec9ef962df79fa7e46b19a00ce768d1c5d7772b164309e6e592619d51a2f36aad55f9415a818adb74704de62f58247133abd3 SHA512 fed0a74b4c7ae8557eb07eeec0ac875dba856353b97c3c38fc2ff90b2dc4f1ae9c87f44b4b75a61fed069b1cf73d7ed5754bca2a971d6d4b99f1b03357324fa0
 DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.8.zip 3312938 BLAKE2B 6e8c2c20306706b3f9685f4e4f244c64cc2224f723117dbd5409609058b2596bda9246ecaefdee63ebd8084ab62426bae84bd808ef7736e5b9474e37d835ace8 SHA512 2baf6a76216c2e8261c5413c3170ca174515c18e0d3e4ef02f32618a61518f51c78e7026d99b6b5cb1f8af90adb35342ade05ce3c7897d1a8d9bf2f02d6e5146
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.19.3.mod 2281 BLAKE2B 5e739880b1e208bcf721dac1f0f0f9662c8d538e86d625cfe42a375236282ce4e11cd75e29a20cb7aa05b1b818d021d5c6fd9c26f51a33a21d2d7ae77613b698 SHA512 0c84263fb449a087048a3d32506d54f8285a94b7ab8d43f5d65ded176d7f56e8b1d33d0c8c84832592a0137e69ee09e4c4d7c33e1a8e945740ccdc7fe539f701
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.19.3.zip 3346263 BLAKE2B 4fd0b7e63f76d74262ab32f8af81e4c3cbf476196862db6cba23d313fce04982fbeac44cd47bf7dea8257a5d57f5f7003b8a0d43e8a7db8b518b2dc2b5a5caf2 SHA512 027f557453d70d721fd70389e5cc4cdcfb9f38ec13b280f9060e0530f9e9fec17d4d306c5521a1013125c21f8c964da1d25b4c859b9cefdb2b5fafb9357b03d3
 DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
 DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.4.mod 692 BLAKE2B 0d75dc7a0df4f86c3499fcd3838043ec3206281b43393cf210fc91f29d6516ff7313fd2e42713dcb04afd45ec16f2ed58e73becaef147b41d1d6ec71da20b477 SHA512 39d689b3b0edd309c042862e2f8c852f5320111c28c651a3f7e34ecb498970b26eade8e15738815fe6d11f16af87a7b33383855675ebd15d198384d11d3833e9
 DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.8.mod 692 BLAKE2B 1ef91337ee3abc8206e7118df4ba9d25add0b70a75073f65a7a0686e4653abb45aea53f270765039dc0236f4312ab10c7d71f9fcec50662abcfce6a6ec0e20c1 SHA512 032530a5611bde524d7f1fab3548830c45696e306f5a2c8189f9d8f005b9bf0cbafc6da38ccb1b2083be3257e2398afc785a0b6f498b07e75263440eeb84bd30
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.19.3.mod 472 BLAKE2B 0d9effb9eaf256b65b633d91c0aae1af596c2da19de178411187cb2ec8d2eba4570e97381445258006b0c196eecd5e5e952e2502d510177f7706d905fd301552 SHA512 129785dd355c37d94b2bcab564bd44a8e7ad8c6f7e383774a6f4133688486b51e273cf5659cdbed9f03651cf64b32716b2cba9bd4850964410ae748d4bf92af4
 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-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 rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 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%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%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%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 sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod 20 BLAKE2B 9817a2968dcdd45e9e5d40b93cb54e6002d0aa6613f241bd77d448b3173b639f58a88d25899734be39a822473b4aac69ad947878006d5bb266a13f24637b0082 SHA512 b052661c1a3c2599fa350578cde2899166b39b71c65a6414ca7ea33e8d5186e85895ebd948819313781041d06fac3292cb08ad12447060df3860a86402344c24
-EBUILD helm-2.16.1.ebuild 10055 BLAKE2B 6a0279e082cd74eafb01b4fc77b97a62ddd2e6ce44969db65d053a507f081583501b05afe6220e86dae5b037700ba410a4c67e3c1fa92472360c774f7fd05ee4 SHA512 78f9aeb398ce93c64fb558be4edd3fb9cb55d42f2658cdf57f0bd8fcccb4269007c1d952494a50a655cd57d4b7a89690df9a48485c77876ddf438600d4153b6a
-EBUILD helm-2.16.9.ebuild 10053 BLAKE2B 2afbc8dde7c233bb7dc93759e8f95d166fec1bad1b25d6f2da43ce3ce6d004c518d9b241f18a4c4c3fd9d5322dc4ea0801e612a4614c47969348d0d3d33904e5 SHA512 d305a121a6dcd2e609b5b51ed26a8676912be2576502ce32e6a3c242a2b45b1978cdb2eefc715e1d8c1e5e1cffe131dc94590d9eef6a0e2eff5a9ea18f2522b4
 EBUILD helm-3.3.4.ebuild 53769 BLAKE2B a43abc89b94f837cb83beddd4fb1efa8e0ea75f8daf972142aa898767075f72d2db90e653ee149a9ebdf43834b8caeb2883c927733df136c8ae1c3377ba9550d SHA512 e8f01ab1ac529e8a67f67146ab906b4162c3799e1dad1503cedca12fb82a84297df063293f10fd62997d554414d551df414ceefc0a2f56fcd66b0fc5b772bcfa
+EBUILD helm-3.4.1.ebuild 61570 BLAKE2B 630a410c9ae384f61b0db72738e276a8e5361ef3cc18402d5e53597223c8b8acb066abd958740c21dcbbdbd98cc0ad94cf6bb13cded3262766b06b1548959fae SHA512 81e76faac2da824fab415e342ade26667952ac9201a6060d53354e9f26e9a17bd7f62ceec0c5c8e692fc5ca3cc070c13db280f4523529d9ea4f192682497841b
 MISC metadata.xml 322 BLAKE2B b452dfaecaf6b32e7fc334ddb00444d739a618898f8e0d6905e8b3191acc7f0fc5e3929345405d86f9ab56e8ad80fbcd1dd46a0ea3ff5aaa2bb9f56407d10234 SHA512 ef4bb714213346e60a2a39833d0ab1987e10d2b34460a053b479775163e8778021ef3da63a8f5fede055281298dab88309a796cf3ad650c2d3ddeb17a7b0b4be
diff --git a/app-admin/helm/helm-2.16.1.ebuild b/app-admin/helm/helm-2.16.1.ebuild
deleted file mode 100644
index 6f4db7a99f2d..000000000000
--- a/app-admin/helm/helm-2.16.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="k8s.io/helm"
-
-MY_PV=${PV/_rc/-rc.}
-
-EGO_VENDOR=(
-"cloud.google.com/go 8c41231e01b2085512d98153bcffb847ff9b4b9f github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
-"github.com/Azure/go-autorest 69b4126ece6b5257e2f9b0017007d2334153655f"
-"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
-"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
-"github.com/cpuguy83/go-md2man 7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19"
-"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
-"github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73"
-"github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
-"github.com/docker/distribution 2461543d988979529609e8cb6fca9ca190dc48da"
-"github.com/docker/docker be7ac8be2ae072032a4005e8f232be3fc57e4127"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/color 3f9d52f7176a6927daacff70a3e8d1dc2025c53e"
-"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
-"github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf 65acae22fc9d1fe290b33faa2bd64cdc20a463a0"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf 6c65a5562fc06764971b7c5d05c76c75e84bdbf7"
-"github.com/google/btree 4030bb1f1f0c35b30ca7009e9ebd06849dd45306"
-"github.com/google/go-cmp 6f77996f0c42f7b84e5a2b252227263f93432e9b"
-"github.com/google/gofuzz f140a6486e521aad38f5917de355cbf147cc0496"
-"github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud c2d73b246b48e239d3f03c455905e06fe26e33c3"
-"github.com/gosuri/uitable 2cf933346b8370a3a3d8867ef5cf54b2129d8ecf"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 6af20e3a5340d5e6bde20c8a7a78699efe19ac0a"
-"github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
-"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
-"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
-"github.com/json-iterator/go 27518f6661eba504be5a7a9a9f6d9460d892ade3"
-"github.com/konsorten/go-windows-terminal-sequences 5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
-"github.com/lib/pq f91d3411e481ed313eeab65ebfe9076466c39d01"
-"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
-"github.com/Masterminds/semver 805c489aa98f412e79eb308a37996bf9d8b1c91e"
-"github.com/Masterminds/sprig e4c0945838d570720d876a6ad9b4568ed32317b4"
-"github.com/Masterminds/vcs f94282d8632a0620f79f0c6ff0e82604e8c5c85b"
-"github.com/mattn/go-colorable 98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"
-"github.com/mattn/go-isatty 0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a"
-"github.com/mattn/go-runewidth 9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf"
-"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
-"github.com/mitchellh/copystructure 9a1b6f44e8da0e0e374624fb0a825a231b00c537"
-"github.com/mitchellh/go-wordwrap 9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"
-"github.com/mitchellh/reflectwalk 3e2c75dfad4fbf904b58782a80fd595c760ad185"
-"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
-"github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
-"github.com/opencontainers/go-digest 279bed98673dd5bef374d3b6e4b09e2af76183bf"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"
-"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
-"github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
-"github.com/prometheus/common 4724e9255275ce38f7179b2478abeae4e28c904f"
-"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/rubenv/sql-migrate 9355dd04f4b3dc9ed604623307307a3491a627bc"
-"github.com/russross/blackfriday 05f3235734ad95d0016f6a23902f06461fcf567a"
-"github.com/sirupsen/logrus 839c75faf7f98a33d445d181f3018b5c3409a45e"
-"github.com/spf13/cobra f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"
-"github.com/spf13/pflag 2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab"
-"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
-"golang.org/x/crypto e84da0312774c21d64ee2317962ef669b27ffb41 github.com/golang/crypto"
-"golang.org/x/net cdfb69ac37fc6fa907650654115ebebb3aae2087 github.com/golang/net"
-"golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
-"golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e github.com/golang/sync"
-"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 github.com/golang/sys"
-"golang.org/x/text e6919f6577db79269a6443b9dc46d18f2238fb5d github.com/golang/text"
-"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
-"google.golang.org/appengine 54a98f90d1c46b7731eb8fb305d2a321c30ef610 github.com/golang/appengine"
-"google.golang.org/genproto 919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0 github.com/google/go-genproto"
-"google.golang.org/grpc a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
-"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/square/go-jose.v2 e94fb177d3668d35ab39c61cbb2f311550557e83 github.com/square/go-jose"
-"gopkg.in/yaml.v2 f221b8435cfb71e54062f6c6e99e9ade30b124d5 github.com/go-yaml/yaml"
-"k8s.io/api 35e52d86657aba06859dd22099bfa14faf1effb2 github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 5357c4baaf6562e4d37c9afc9fef99bd16d76a9f github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery a2eda9f80ab8a454a81bdde16d62a1afe5f931c0 github.com/kubernetes/apimachinery"
-"k8s.io/apiserver 5190913f932d82e562d4eb91d0f3d7a063bdbc07 github.com/kubernetes/apiserver"
-"k8s.io/client-go bec269661e48cb1e5fbb0d037f356ffe9e9978a0 github.com/kubernetes/client-go"
-"k8s.io/cli-runtime 74ad18325ed51ea6de9ee19bae59156bad18ecd2 github.com/kubernetes/cli-runtime"
-"k8s.io/component-base 039242c015a9f5eeaccea3ea17c6973b9c27166a github.com/kubernetes/component-base"
-"k8s.io/klog 3ca30a56d8a775276f9cdae009ba326fdc05af7f github.com/kubernetes/klog"
-"k8s.io/kube-openapi 743ec37842bffe49dd4221d9026f30fb1d5adbc4 github.com/kubernetes/kube-openapi"
-"k8s.io/kubectl 2ed914427d51f6fd865e0db43d72b2f22610cf32 github.com/kubernetes/kubectl"
-"k8s.io/kubernetes c97fe5036ef3df2967d086711e6c0c405941e14b github.com/kubernetes/kubernetes"
-"k8s.io/utils 581e00157fb1a0435d4fac54a52d1ca1e481d60e github.com/kubernetes/utils"
-"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
-"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
-"vbom.ml/util efcd4e0f97874370259c7d93e12aad57911dea81 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="bbdfe5e7803a12bbdf97e94cd847859890cf4050"
-
-ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="amd64"
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
-		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
-		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
-
-	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
-	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
-	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
-	popd || die
-	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} bin/tiller
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-admin/helm/helm-2.16.9.ebuild b/app-admin/helm/helm-2.16.9.ebuild
deleted file mode 100644
index 0a0305fee7b9..000000000000
--- a/app-admin/helm/helm-2.16.9.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="k8s.io/helm"
-
-MY_PV=${PV/_rc/-rc.}
-
-EGO_VENDOR=(
-"cloud.google.com/go 8c41231e01b2085512d98153bcffb847ff9b4b9f github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
-"github.com/Azure/go-autorest 69b4126ece6b5257e2f9b0017007d2334153655f"
-"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
-"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
-"github.com/cpuguy83/go-md2man 7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19"
-"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
-"github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73"
-"github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
-"github.com/docker/distribution 2461543d988979529609e8cb6fca9ca190dc48da"
-"github.com/docker/docker be7ac8be2ae072032a4005e8f232be3fc57e4127"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/color 3f9d52f7176a6927daacff70a3e8d1dc2025c53e"
-"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
-"github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf 65acae22fc9d1fe290b33faa2bd64cdc20a463a0"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf 6c65a5562fc06764971b7c5d05c76c75e84bdbf7"
-"github.com/google/btree 4030bb1f1f0c35b30ca7009e9ebd06849dd45306"
-"github.com/google/go-cmp 6f77996f0c42f7b84e5a2b252227263f93432e9b"
-"github.com/google/gofuzz f140a6486e521aad38f5917de355cbf147cc0496"
-"github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud c2d73b246b48e239d3f03c455905e06fe26e33c3"
-"github.com/gosuri/uitable 2cf933346b8370a3a3d8867ef5cf54b2129d8ecf"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 6af20e3a5340d5e6bde20c8a7a78699efe19ac0a"
-"github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
-"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
-"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
-"github.com/json-iterator/go 27518f6661eba504be5a7a9a9f6d9460d892ade3"
-"github.com/konsorten/go-windows-terminal-sequences 5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
-"github.com/lib/pq f91d3411e481ed313eeab65ebfe9076466c39d01"
-"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
-"github.com/Masterminds/semver 805c489aa98f412e79eb308a37996bf9d8b1c91e"
-"github.com/Masterminds/sprig e4c0945838d570720d876a6ad9b4568ed32317b4"
-"github.com/Masterminds/vcs f94282d8632a0620f79f0c6ff0e82604e8c5c85b"
-"github.com/mattn/go-colorable 98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"
-"github.com/mattn/go-isatty 0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a"
-"github.com/mattn/go-runewidth 9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf"
-"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
-"github.com/mitchellh/copystructure 9a1b6f44e8da0e0e374624fb0a825a231b00c537"
-"github.com/mitchellh/go-wordwrap 9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"
-"github.com/mitchellh/reflectwalk 3e2c75dfad4fbf904b58782a80fd595c760ad185"
-"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
-"github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
-"github.com/opencontainers/go-digest 279bed98673dd5bef374d3b6e4b09e2af76183bf"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"
-"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
-"github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
-"github.com/prometheus/common 4724e9255275ce38f7179b2478abeae4e28c904f"
-"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/rubenv/sql-migrate 9355dd04f4b3dc9ed604623307307a3491a627bc"
-"github.com/russross/blackfriday 05f3235734ad95d0016f6a23902f06461fcf567a"
-"github.com/sirupsen/logrus 839c75faf7f98a33d445d181f3018b5c3409a45e"
-"github.com/spf13/cobra f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"
-"github.com/spf13/pflag 2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab"
-"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
-"golang.org/x/crypto e84da0312774c21d64ee2317962ef669b27ffb41 github.com/golang/crypto"
-"golang.org/x/net cdfb69ac37fc6fa907650654115ebebb3aae2087 github.com/golang/net"
-"golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
-"golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e github.com/golang/sync"
-"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 github.com/golang/sys"
-"golang.org/x/text e6919f6577db79269a6443b9dc46d18f2238fb5d github.com/golang/text"
-"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
-"google.golang.org/appengine 54a98f90d1c46b7731eb8fb305d2a321c30ef610 github.com/golang/appengine"
-"google.golang.org/genproto 919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0 github.com/google/go-genproto"
-"google.golang.org/grpc a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
-"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/square/go-jose.v2 e94fb177d3668d35ab39c61cbb2f311550557e83 github.com/square/go-jose"
-"gopkg.in/yaml.v2 f221b8435cfb71e54062f6c6e99e9ade30b124d5 github.com/go-yaml/yaml"
-"k8s.io/api 35e52d86657aba06859dd22099bfa14faf1effb2 github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 5357c4baaf6562e4d37c9afc9fef99bd16d76a9f github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery a2eda9f80ab8a454a81bdde16d62a1afe5f931c0 github.com/kubernetes/apimachinery"
-"k8s.io/apiserver 5190913f932d82e562d4eb91d0f3d7a063bdbc07 github.com/kubernetes/apiserver"
-"k8s.io/client-go bec269661e48cb1e5fbb0d037f356ffe9e9978a0 github.com/kubernetes/client-go"
-"k8s.io/cli-runtime 74ad18325ed51ea6de9ee19bae59156bad18ecd2 github.com/kubernetes/cli-runtime"
-"k8s.io/component-base 039242c015a9f5eeaccea3ea17c6973b9c27166a github.com/kubernetes/component-base"
-"k8s.io/klog 3ca30a56d8a775276f9cdae009ba326fdc05af7f github.com/kubernetes/klog"
-"k8s.io/kube-openapi 743ec37842bffe49dd4221d9026f30fb1d5adbc4 github.com/kubernetes/kube-openapi"
-"k8s.io/kubectl 2ed914427d51f6fd865e0db43d72b2f22610cf32 github.com/kubernetes/kubectl"
-"k8s.io/kubernetes c97fe5036ef3df2967d086711e6c0c405941e14b github.com/kubernetes/kubernetes"
-"k8s.io/utils 581e00157fb1a0435d4fac54a52d1ca1e481d60e github.com/kubernetes/utils"
-"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
-"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
-"vbom.ml/util efcd4e0f97874370259c7d93e12aad57911dea81 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT=8ad7037828e5a0fca1009dabe290130da6368e39
-
-ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="amd64"
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
-		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
-		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
-
-	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
-	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
-	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
-	popd || die
-	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} bin/tiller
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-admin/helm/helm-3.4.1.ebuild b/app-admin/helm/helm-3.4.1.ebuild
new file mode 100644
index 000000000000..2d9bef39816e
--- /dev/null
+++ b/app-admin/helm/helm-3.4.1.ebuild
@@ -0,0 +1,1171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=c4e74854886b2efe3321e185578e6db9be0a6e29
+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"
+	"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/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest v13.3.2+incompatible"
+	"github.com/Azure/go-autorest v13.3.2+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0"
+	"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"
+	"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"
+	"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"
+	"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/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/DATA-DOG/go-sqlmock v1.4.1"
+	"github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.5.0"
+	"github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod"
+	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/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"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver/v3 v3.1.0"
+	"github.com/Masterminds/semver/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.1.0"
+	"github.com/Masterminds/sprig/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/squirrel v1.4.0"
+	"github.com/Masterminds/squirrel v1.4.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.15-0.20190919025122-fc70bd9a86b5"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7"
+	"github.com/Microsoft/hcsshim v0.8.7/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.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/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+	"github.com/Shopify/sarama v1.19.0/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/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/agnivade/levenshtein v1.0.1/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/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+	"github.com/apache/thrift v0.12.0/go.mod"
+	"github.com/apache/thrift v0.13.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/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/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-lambda-go v1.13.3/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+	"github.com/aws/aws-sdk-go-v2 v0.18.0/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"
+	"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/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/blang/semver v3.5.0+incompatible/go.mod"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/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/casbin/casbin/v2 v2.1.2/go.mod"
+	"github.com/cenkalti/backoff v2.2.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/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/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+	"github.com/containerd/containerd v1.3.2"
+	"github.com/containerd/containerd v1.3.2/go.mod"
+	"github.com/containerd/containerd v1.3.4"
+	"github.com/containerd/containerd v1.3.4/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448"
+	"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"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd"
+	"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.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/go.mod"
+	"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/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/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/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/deislabs/oras v0.8.1"
+	"github.com/deislabs/oras v0.8.1/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/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/go.mod"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod"
+	"github.com/docker/distribution v0.0.0-20191216044856-a8371794149d"
+	"github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod"
+	"github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce/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-metrics v0.0.0-20180209012529-399ea8c73916"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/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"
+	"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/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/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.6.9/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/evanphx/json-patch v0.0.0-20200808040245-162e5629780b"
+	"github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/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/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/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"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7"
+	"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-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/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/kit v0.10.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"
+	"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/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"
+	"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/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-sql-driver/mysql v1.4.0/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/gobuffalo/envy v1.7.0/go.mod"
+	"github.com/gobuffalo/envy v1.7.1"
+	"github.com/gobuffalo/envy v1.7.1/go.mod"
+	"github.com/gobuffalo/logger v1.0.1"
+	"github.com/gobuffalo/logger v1.0.1/go.mod"
+	"github.com/gobuffalo/packd v0.3.0"
+	"github.com/gobuffalo/packd v0.3.0/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.7.1"
+	"github.com/gobuffalo/packr/v2 v2.7.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-20190422162347-ade71ed3457e/go.mod"
+	"github.com/godror/godror v0.13.3/go.mod"
+	"github.com/gofrs/flock v0.7.1"
+	"github.com/gofrs/flock v0.7.1/go.mod"
+	"github.com/gofrs/flock v0.8.0"
+	"github.com/gofrs/flock v0.8.0/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/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/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"
+	"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/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 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/protobuf v1.3.3/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-20180518054509-2e65f85255db/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/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/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"
+	"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/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"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/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
+	"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.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/go.mod"
+	"github.com/gorilla/context v1.1.1/go.mod"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+	"github.com/gorilla/mux v1.6.2/go.mod"
+	"github.com/gorilla/mux v1.7.2"
+	"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/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gorilla/websocket v1.4.0/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-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/hashicorp/consul/api v1.3.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.3.0/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-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"
+	"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"
+	"github.com/hpcloud/tail v1.0.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/imdario/mergo v0.3.5/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/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0/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/jmoiron/sqlx v1.2.0"
+	"github.com/jmoiron/sqlx v1.2.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/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"
+	"github.com/json-iterator/go v1.1.8/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/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/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/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/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/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.0.0/go.mod"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/lib/pq v1.7.0"
+	"github.com/lib/pq v1.7.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/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/lithammer/dedent v1.1.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/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/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.0.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-shellwords v1.0.10"
+	"github.com/mattn/go-shellwords v1.0.10/go.mod"
+	"github.com/mattn/go-sqlite3 v1.9.0/go.mod"
+	"github.com/mattn/go-sqlite3 v1.12.0"
+	"github.com/mattn/go-sqlite3 v1.12.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/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/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/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/osext v0.0.0-20151018003038-5e2d6d41470f"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.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/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/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/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/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/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/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.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.2/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.10.1"
+	"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 v1.4.3/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-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"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/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"
+	"github.com/opencontainers/runc v0.1.1/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/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.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/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-toml v1.2.0/go.mod"
+	"github.com/performancecopilot/speed v3.0.0+incompatible/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/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-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/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-0.20190127221311-3c4408c8b829/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.3.0"
+	"github.com/prometheus/client_golang v1.3.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-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"
+	"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-20180110214958-89604d197083/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"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/common v0.7.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-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.5"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/procfs v0.0.8"
+	"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/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/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.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.2/go.mod"
+	"github.com/rogpeppe/go-internal v1.4.0"
+	"github.com/rogpeppe/go-internal v1.4.0/go.mod"
+	"github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351"
+	"github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351/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/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/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/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.4-0.20170822132746-89742aefa4b2/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"
+	"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/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/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.2/go.mod"
+	"github.com/spf13/cast v1.3.0"
+	"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.5"
+	"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/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/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"
+	"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"
+	"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/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/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/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/go.mod"
+	"github.com/urfave/cli v1.22.1/go.mod"
+	"github.com/vektah/gqlparser v1.1.2/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/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/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/etcd v0.0.0-20191023171146-3cf2f69b5738/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.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.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2"
+	"go.opencensus.io v0.22.2/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/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.3.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"
+	"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-20190320223903-b7391e95e576/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-20190617133340-57b3e21c3d56/go.mod"
+	"golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/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-20200128174031-69ecbb4d6d5d"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/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-20200414173820-0848c9571904"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/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/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-20191227195350-da58074b4299/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/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/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-20181005035420-146acd28ed58/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-20190125091013-d26f9f9a57f3/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-20190320064053-1272bf9dcd53/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-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-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/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/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"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/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-20190209173611-3b5209105503/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-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-20190515120540-06a5c4944438/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-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-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3"
+	"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-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f"
+	"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-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"
+	"golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/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"
+	"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"
+	"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-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-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/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-20191004055002-72853e10c5a3/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-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-20200103221440-774c71fcf114/go.mod"
+	"golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/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"
+	"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/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.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/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.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-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-20190530194941-fb225487d101/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-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.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.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0"
+	"google.golang.org/grpc v1.27.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"
+	"google.golang.org/protobuf v1.24.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"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/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.3/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/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/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.8"
+	"gopkg.in/yaml.v2 v2.2.8/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"
+	"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"
+	"k8s.io/api v0.18.4"
+	"k8s.io/api v0.18.4/go.mod"
+	"k8s.io/api v0.18.8"
+	"k8s.io/api v0.18.8/go.mod"
+	"k8s.io/api v0.19.2"
+	"k8s.io/api v0.19.2/go.mod"
+	"k8s.io/api v0.19.3"
+	"k8s.io/api v0.19.3/go.mod"
+	"k8s.io/apiextensions-apiserver v0.19.3"
+	"k8s.io/apiextensions-apiserver v0.19.3/go.mod"
+	"k8s.io/apimachinery v0.19.3"
+	"k8s.io/apimachinery v0.19.3/go.mod"
+	"k8s.io/apiserver v0.19.3/go.mod"
+	"k8s.io/cli-runtime v0.19.3"
+	"k8s.io/cli-runtime v0.19.3/go.mod"
+	"k8s.io/client-go v0.19.3"
+	"k8s.io/client-go v0.19.3/go.mod"
+	"k8s.io/code-generator v0.19.3/go.mod"
+	"k8s.io/component-base v0.19.3"
+	"k8s.io/component-base v0.19.3/go.mod"
+	"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+	"k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/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-openapi v0.0.0-20200805222855-6aeccd4b50c6"
+	"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod"
+	"k8s.io/kubectl v0.19.3"
+	"k8s.io/kubectl v0.19.3/go.mod"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+	"k8s.io/metrics v0.19.3/go.mod"
+	"k8s.io/utils v0.0.0-20200729134348-d5654de09c73"
+	"k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod"
+	"rsc.io/binaryregexp v0.2.0/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/v4 v4.0.1"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.0.1/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"
+	"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/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_SHA=${GIT_COMMIT} \
+		GIT_COMMIT=${GIT_COMMIT:0:7} \
+		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-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index c2d44b1db8c2..4ee910bf6da1 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 09481f395362..c5389573b180 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -4,5 +4,5 @@ DIST siege-4.0.5.tar.gz 525122 BLAKE2B 6d7410255d9682eeb6755bbf2eb6fd189d1c6e5e4
 DIST siege-4.0.7.tar.gz 525654 BLAKE2B b97c7309d33387d15327dc39ae115bebdfe64fa0debea2da87590ce801d2f590622392ea1ecc6be9f2973ff9b37dfc0f5f0fef232a4593410c4503db6c78771f SHA512 2dcccc50a2d8cd0d6c18efe776b871b999f6918c078898845fec34bb2b1b8ec03e0b95792dd963aaefb054e4f4e27f604ed95c0de5f8a34cbf738f66a2307abc
 EBUILD siege-4.0.4.ebuild 1123 BLAKE2B 8af237cd30a38f95543ab429ccd143bd336c46c4ffe6dac966219cf95c20fe73b74dbab4d576f0574c3f3f3d2fd02883b351e2492ef7da480b3ba6c025b5b6cf SHA512 19470077886d58d05d1e63d067137e3816af44639d49a59bc81f685be077790bcd927e27297ec7205173472edccf692cb7fb249af7404c6ab037baa588228d7d
 EBUILD siege-4.0.5.ebuild 1275 BLAKE2B c576911dadc810da8459e1c7d87be18b41da2275a9d445b2fbd15eaedea616db81bc11aeedb119c28df74322ef28fb9a92fc2248ae8025756dd2096f38ee5c44 SHA512 1aa8ad1f8d47675fa6284c02bc3db4b086c04bfb5cddc3c0566fdd1fb82fd2ee8b56f9e6bb08781d3844415c3bd4fba21e098b83c676a4a4c95c1ccb5a2f7883
-EBUILD siege-4.0.7.ebuild 1280 BLAKE2B 85f847fdca7eed9a931dd9e10787ec9a969bf5f96e0dbff2513fc1e8f999324bbe1fd23e3b58aae397d62a39e298361cf116cef33ab3387a2fdcc5509a5e4019 SHA512 54147f3b7ab8e8a1b87f0170a62f630fb76ca3966a4371ffef1338a8cb22a74d3c41551bedb1e2df0803eadffe20e86cdd11beaf91465a2b58f60ee050617ea4
+EBUILD siege-4.0.7.ebuild 1279 BLAKE2B 20c50d6ce94ab0ecaa8f17252206c021dd986797f607851cb7377b40a906e671636d4768049a1fb4781a6ca4ce6c47c41da50601070d0d986b039e23c35c353f SHA512 2b1f0a85963f39a1b972627d3c1873db513e1bb7da99dad36cbaca994d57b1f07a7ea91e3f14b3752925754278f1f92889a15a1984016ebe16c889c1f0fb48d7
 MISC metadata.xml 832 BLAKE2B f56d0661ec0f81d5f155be79e6b52712bead41876a1ad2049e9597ba8923b7c0583d1176b64d4f6c76d18adc84f8eba244170e218f4987c6e499138334295be5 SHA512 7f0697daa7194a1a4565f83cb8654272b4e6ed630f41f7be83dd9a972c93ed2f1267f5ddd9f3063f39445b7a02f4c9645e0c0e4239262a98b536b28f96a11266
diff --git a/app-benchmarks/siege/siege-4.0.7.ebuild b/app-benchmarks/siege/siege-4.0.7.ebuild
index af205790872c..2c6ff06e63f9 100644
--- a/app-benchmarks/siege/siege-4.0.7.ebuild
+++ b/app-benchmarks/siege/siege-4.0.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
 SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos"
 SLOT="0"
 IUSE="libressl ssl"
 
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 4fe9aefbdf04..78fb83b57964 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/halibut/Manifest b/app-doc/halibut/Manifest
index 0aaf11f90040..c85a8e5f6560 100644
--- a/app-doc/halibut/Manifest
+++ b/app-doc/halibut/Manifest
@@ -1,3 +1,4 @@
+AUX halibut-1.2-fno-common.patch 408 BLAKE2B b976e2385b0e2feacddb50bc63094d419cc11d4c840ccc948049b76df8425e64dc0589190d62ede4e510f4fab25d7c9db3d860372889f04b141c7cf48b081e8e SHA512 e1559fe7288c735c6cc29eb86d615d4d9e593c360226cef916e105bef3498d5ba269dab897d1be37702b8642ff8d40f9f9128f20d42d1b41c57bd10d47d7242e
 DIST halibut-1.2.tar.gz 991975 BLAKE2B e5751d2f90968240825e3ddadbc070de856f6a340e832bcf0977fb8d31f7b7c8eefa776f3bba4df58641d22cca7e9ac562eef236069e1d9a8e9cdb41324a7376 SHA512 b04cc5c52f2d7cd2bb9a36a1aa896c6a4fd11bcfc5fad3d9c74576bf2576ce237cd7ac3ceeff3bd10dfd5a229614d06d23323509d3a83ff74b4a1965e1d726fc
-EBUILD halibut-1.2.ebuild 850 BLAKE2B 7b224fda43aef3ced94758cc7cb7262925b19d19e109fe51c72f629401bd8aa518f42fe8279f12048fba57197503503898d6cb6dc7d116bf6e5e050d85e63898 SHA512 d1e38ef45fc876a9484b8cc005f77c98a72db671b4c35aebd5392268817e0d7f4f798f321f4a5113273a6763beb262d2fdde4e11739ce05f6d86c2874ee5d4f4
+EBUILD halibut-1.2.ebuild 888 BLAKE2B 7d066763af3d20e3c78ae84aa3ca455d9715c4c61868923e85b8511fde458aac1cb02da5c5cbae57710e1921826b660de78c6b42e7959f50b6f0570f44402eb5 SHA512 1dead2071184ae270f3f0efc44df410dfda6caf53739b10e0493139975c6691d475f3cc4b757f492e7eefc45ec82511ef0531b87d4d3fafaf2273541521e338f
 MISC metadata.xml 248 BLAKE2B 098d4976304542e71e494b46eb846b1ddc3f761a0e1eb4477c68fb0270bfd195de3fa8da7de3cf5a86d33442d7f1fc30fded9f56346e784edfbb969387d62eb5 SHA512 5a0cba98b94cc06306b0e352d40ff113de69408752b14e1ba9efdce3f564c9bd11f8f65e89fc24d2e2056056edef5b77ab1ca8aa33e7faad5d0eaef40b895c85
diff --git a/app-doc/halibut/files/halibut-1.2-fno-common.patch b/app-doc/halibut/files/halibut-1.2-fno-common.patch
new file mode 100644
index 000000000000..e547e304d9c3
--- /dev/null
+++ b/app-doc/halibut/files/halibut-1.2-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/bk_paper.c
++++ b/bk_paper.c
+@@ -75,6 +75,8 @@
+ #include "halibut.h"
+ #include "paper.h"
+ 
++font_info *all_fonts;
++
+ typedef struct paper_conf_Tag paper_conf;
+ typedef struct paper_idx_Tag paper_idx;
+ 
+--- a/paper.h
++++ b/paper.h
+@@ -78,7 +78,7 @@ struct ligature_Tag {
+  * metrics are read in.
+  */
+ 
+-font_info *all_fonts;
++extern font_info *all_fonts;
+ 
+ struct font_info_Tag {
+     font_info *next;
diff --git a/app-doc/halibut/halibut-1.2.ebuild b/app-doc/halibut/halibut-1.2.ebuild
index 13c64206e3f6..933b648f2be5 100644
--- a/app-doc/halibut/halibut-1.2.ebuild
+++ b/app-doc/halibut/halibut-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,8 @@ SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_compile() {
 	tc-export CC
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index ea4833d21b34..cbafba2ae183 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index e8dd8bae07f9..5648aa2b3332 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,11 +9,12 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
-EBUILD emacs-23.4-r20.ebuild 11175 BLAKE2B 81160f566444d92fc5ea43f78334590e94a22facf875a51b55e932e460dcf8d09aef6a338e207966ac95353f79ccc639e6aea6021bcd1d6a96d30a5877ed388d SHA512 32a5899626ad5fce7067df0445458af251a5ff14e9bdece643c7784770e576600c0670cbdb588e341d7e81799a45186f35554e20ce5d8a2ef910b2f12a623b62
-EBUILD emacs-24.5-r9.ebuild 11045 BLAKE2B 9f96003288deb53fd79f259d7c84c2daf95fe501e8183684c0a4ddff1ddeda0fb6e2a2e224dce2ad8df573ada00d9c7ba1ae8d0ad26cb926a51d4b86780149ad SHA512 17038fe4cd88fcb220d23eda3c22a498639af4b05b0d3da38b2b5eb3b4a210c6aef9cfa8b6cd3fcf5830ac7b422533b3aeaf1b9c65edcd0a7502a860717e0d51
-EBUILD emacs-25.3-r8.ebuild 11387 BLAKE2B aa940b1226a213ae9260db0517ad9e7da2a4fc2ddeb5d2d08414f36a207ee3089fb109f603496511865814848f016d4a40d4699085af25640c18c27f5da9289d SHA512 b55fa576211fd48ddce54f9a8b4718c81ec6d425fe895fe97f44b4f5c74ddbad84ffc920eed7140c6b1f234de134d7643cf91c7e98030d761f8cad000c4bdbbf
-EBUILD emacs-26.3-r3.ebuild 12205 BLAKE2B 79b910b2bb1e50f52ee2af4b8b3099a96eee2d37fa268daf551ceb7da87afd6bf2da0b126e4a223bc714dc5beb473e102465c5bd8d295bda8abe6169647175f1 SHA512 86f2afa0d62bf84952eb4a16052a9779b87595025de6cfa2c4d118b362ae56b3510f56c942ee7508d8897c1514e38c02d759230a64bb73c8d280060009326b50
-EBUILD emacs-27.1-r2.ebuild 13750 BLAKE2B 3c6cc5c865676e09d7902637b76106148f5a2cf7f64cd47056401e91421668a8b9ab162d9e0e47cabd155f7d8451e576e06c84a1937ad173b300578b6795adf1 SHA512 37316aea5e8c4fbfcfbfe61e01edba0cf137f76d5b8ceba40c4aff32454f91cf9f5724f2682481ee3b512e4b75d7d224be7fd7f94b26a66c552893b5f370fea5
-EBUILD emacs-27.1.9999-r1.ebuild 13714 BLAKE2B 156f0487d366dffffa9ddef9647733f59842bc6ce0078f746b70e5836722911e8f7b10f3b6dc4e96ce0e388e25d5faf56c059dbee9b7b99bb64ef2103571acbd SHA512 d9173643778778a0c6e721a924a6e26ea8fc29dfb7f2c5de359d82402fc7a9da1800efd2be906e7270807004140a37c59c1f39429711b9769c1a2dd44e8b18e6
-EBUILD emacs-28.0.9999.ebuild 13685 BLAKE2B 95c15cb3aba782ed60b393e23f29d2d6d7ed79fd37711fc96f8d24080a287900e1f8f6b01ce3c22746ea3395f838ed524fdb90006844f1a665f2c140078e51f2 SHA512 32ad801c80e322b5112bec39de7d7b0bd9bcc12654c874b54cc189d029e5fd683af20b06e9c28eea72bee9def032bc8af7658a8b0720e7bc68c695f1d9fecf56
+EBUILD emacs-23.4-r20.ebuild 11205 BLAKE2B 28556a3ce71eccebd987f71283e694b53074760affa3975227c35f71c74d5e0d64ee3ab82861f57ac0e1c1801ffe565e16c30e8edd25c038ea80bf9452f27ac7 SHA512 236a6d83c14674ea291de35e5cd352ba7c66dc75baa12de2d96d95e1927222eac4681018519c5789b565e799a2ce91d26a250c770901ffa429a7b839171dfbfb
+EBUILD emacs-24.5-r9.ebuild 11075 BLAKE2B e4116ba6e43aa822451495971968edafe2f477b9f7322bae0bdc941abf4251f2a4a5f71fdd6ab686f70996b7121a320d99ebcf64b5dadc5848f8d3bcce0e3e4f SHA512 e98c42cbc1225fe2260b1c597f547db9f168532937cf7e45bca3cb9c0899d116e3a7e2ed099de1c58d232d2307c1927d79995a8307355493299e135035078049
+EBUILD emacs-25.3-r8.ebuild 11417 BLAKE2B a0ce8f334aff288ef8668059b4e5e692077eab2dffd7b5a1a7c4c98d945a47ec7cc0698e19df78b94aa89d0e5afc2a1aa80315432caea6ffd871dd9d848079a0 SHA512 9187c56beca692a6af103e4c8c1d2be6777778f039cb5aa8347e7b443e527951661658ea0e24503213cf035c43e15e0d04fe449e149b091c29345409a120759a
+EBUILD emacs-26.3-r3.ebuild 12235 BLAKE2B 1fedb87b951b84efc5fd00043fa4e6dd38fadbb23502899d6585518fa5f9a50450ab15574bd14b73663444125934adddbede1767d070ed54ef2adc36b30f7f78 SHA512 cee6a29bc0236000e0d1b813e6f9a7bb52904ef3b3b53481c46f65185782eaeff52d35f69434cc12506bc7e7b05491dac0c22588e62394669fcfd3126a4655fe
+EBUILD emacs-27.1-r2.ebuild 13780 BLAKE2B 4eb150551b4b2d3c59d1e27916b02c24b63a984ed2de75c1235dd8637922bf3e5ca60e59679bd0b2422aa5b3c9f3886856d19c107bc6dfe1a315922b918d762c SHA512 d3d3006ffe53e1efd9f8ac94299deb684882c17d493daa1ee5d3c51122e523e9cd77d5966570561d6d4e3c048a87fdde3aacf3ebc44c004db5742cbf58e95f2f
+EBUILD emacs-27.1-r3.ebuild 14763 BLAKE2B e800e12f4bd127057d8096c78485d0c158d09b42a34b61d91bfe242802aa0d5ff21e6fd379491850e9563ce644b8729033f267f9933657ce5d843b11e75ce0cf SHA512 bd2ee5e972ca25fe139347af879d95419cf2b1a6e6b1bf9d3f1867a776615c5cf5c608932c4244fd320d0915a28b441bcf32d3dd2082078292f3b9621980dd0f
+EBUILD emacs-27.1.9999-r1.ebuild 14720 BLAKE2B a084f683d34e2a1b533ddda7a7b027966eada02fce7b8933274a34e3d3cb421fab79abb5e06efd5f759115db0ff201bf5896c2bc3d33296d80e544316a19dd6f SHA512 dc46bfd84dff1df887c780e3f3c4237757049ca2d58fd4fe609b43f8771efdecc61e85c4b005f9afa1f4c695a71ff5d65edb3ffdba7e5c357ba683721fcfda75
+EBUILD emacs-28.0.9999.ebuild 14691 BLAKE2B 4e45b6e02c15a6a04b4dc6c275222cb3e9570b25f7c5c55f3872d900e1c09e02314198644f09116a82cb27fa6f6ed2d7aea60113ee8ac2516e9137c0d7507bc7 SHA512 d74dffaee2c530b1a60c1ecac4be0fea1162bcd00c171b4a46875fea89f736157c68681e100c5c264709d03fb84367f78982a19c13309dd905a4f30af06f8fc5
 MISC metadata.xml 3000 BLAKE2B f580f25a92f18d36e29880184ddacfc3f59af8e86c9e9b5e0ab0deeff7fb367a79a0331db4d8d85f9c338feba342d683caa3294d06d11e2c1a3c715a5c2649b8 SHA512 ce622b330c89f3c545ccf0f899efd19795cb3279d15762b04248ebaed07e288b51f45f6f0776f5cf6f44f90500220b8026384016808d722085dad2cad020cb51
diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild
index 7817b1255749..32bef55e4fff 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -301,7 +301,7 @@ src_install() {
 
 	dodoc README BUGS
 
-	if use aqua; then
+	if use gui && use aqua; then
 		dodir /Applications/Gentoo
 		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
@@ -316,14 +316,16 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
 	readme.gentoo_create_doc
 }
 
diff --git a/app-editors/emacs/emacs-24.5-r9.ebuild b/app-editors/emacs/emacs-24.5-r9.ebuild
index d205fe64db89..f52f447b679e 100644
--- a/app-editors/emacs/emacs-24.5-r9.ebuild
+++ b/app-editors/emacs/emacs-24.5-r9.ebuild
@@ -298,7 +298,7 @@ src_install() {
 
 	dodoc README BUGS
 
-	if use aqua; then
+	if use gui && use aqua; then
 		dodir /Applications/Gentoo
 		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
@@ -312,14 +312,16 @@ src_install() {
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
-	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
 	readme.gentoo_create_doc
 }
 
diff --git a/app-editors/emacs/emacs-25.3-r8.ebuild b/app-editors/emacs/emacs-25.3-r8.ebuild
index 2deef88cebcf..466ee76552fb 100644
--- a/app-editors/emacs/emacs-25.3-r8.ebuild
+++ b/app-editors/emacs/emacs-25.3-r8.ebuild
@@ -307,7 +307,7 @@ src_install() {
 
 	dodoc README BUGS CONTRIBUTE
 
-	if use aqua; then
+	if use gui && use aqua; then
 		dodir /Applications/Gentoo
 		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
@@ -322,14 +322,16 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
 	readme.gentoo_create_doc
 }
 
diff --git a/app-editors/emacs/emacs-26.3-r3.ebuild b/app-editors/emacs/emacs-26.3-r3.ebuild
index dc65014ec5d0..80915e9112bc 100644
--- a/app-editors/emacs/emacs-26.3-r3.ebuild
+++ b/app-editors/emacs/emacs-26.3-r3.ebuild
@@ -334,7 +334,7 @@ src_install() {
 
 	dodoc README BUGS CONTRIBUTE
 
-	if use aqua; then
+	if use gui && use aqua; then
 		dodir /Applications/Gentoo
 		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
@@ -349,14 +349,16 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
 	readme.gentoo_create_doc
 }
 
diff --git a/app-editors/emacs/emacs-27.1-r2.ebuild b/app-editors/emacs/emacs-27.1-r2.ebuild
index c0a8301900b1..e6c3aef737c4 100644
--- a/app-editors/emacs/emacs-27.1-r2.ebuild
+++ b/app-editors/emacs/emacs-27.1-r2.ebuild
@@ -377,7 +377,7 @@ src_install() {
 
 	dodoc README BUGS CONTRIBUTE
 
-	if use aqua; then
+	if use gui && use aqua; then
 		dodir /Applications/Gentoo
 		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
@@ -392,14 +392,16 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
 	readme.gentoo_create_doc
 }
 
diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild b/app-editors/emacs/emacs-27.1-r3.ebuild
new file mode 100644
index 000000000000..f97171f9c250
--- /dev/null
+++ b/app-editors/emacs/emacs-27.1-r3.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-27"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+RESTRICT="test"
+
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	json? ( dev-libs/jansson )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			gtk2? ( x11-libs/gtk+:2 )
+			!gtk2? (
+				x11-libs/gtk+:3
+				xwidgets? (
+					net-libs/webkit-gtk:4=
+					x11-libs/libXcomposite
+				)
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="app-eselect/eselect-emacs
+	sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	!<=app-editors/emacs-27.1.9999-r0:27-vcs
+	!app-editors/emacs-vcs:27
+	app-eselect/eselect-emacs"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	#AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			if use gtk2; then
+				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
+				use xwidgets && ewarn \
+					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
+			else
+				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			fi
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		if ! use gtk; then
+			use gtk2 && ewarn \
+				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
+			use xwidgets && ewarn \
+				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+		fi
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index a3e4ddfa6837..3b09fd2768c3 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -261,6 +261,17 @@ src_configure() {
 		fi
 	fi
 
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
 	econf \
 		--program-suffix="-${EMACS_SUFFIX}" \
 		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
@@ -270,8 +281,8 @@ src_configure() {
 		--without-compress-install \
 		--without-hesiod \
 		--without-pop \
-		--with-dumping=pdumper \
 		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
 		$(use_enable acl) \
 		$(use_with dbus) \
 		$(use_with dynamic-loading modules) \
@@ -292,10 +303,19 @@ src_configure() {
 		${myconf}
 }
 
-#src_compile() {
-#	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-#	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-#}
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
 
 src_install() {
 	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
@@ -376,7 +396,7 @@ src_install() {
 
 	dodoc README BUGS CONTRIBUTE
 
-	if use aqua; then
+	if use gui && use aqua; then
 		dodir /Applications/Gentoo
 		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
@@ -391,14 +411,21 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
 	readme.gentoo_create_doc
 }
 
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 9ea17e49b558..e6f3ac9b3448 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -260,6 +260,17 @@ src_configure() {
 		fi
 	fi
 
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
 	econf \
 		--program-suffix="-${EMACS_SUFFIX}" \
 		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
@@ -269,8 +280,8 @@ src_configure() {
 		--without-compress-install \
 		--without-hesiod \
 		--without-pop \
-		--with-dumping=pdumper \
 		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
 		$(use_enable acl) \
 		$(use_with dbus) \
 		$(use_with dynamic-loading modules) \
@@ -291,10 +302,19 @@ src_configure() {
 		${myconf}
 }
 
-#src_compile() {
-#	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-#	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-#}
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
 
 src_install() {
 	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
@@ -375,7 +395,7 @@ src_install() {
 
 	dodoc README BUGS CONTRIBUTE
 
-	if use aqua; then
+	if use gui && use aqua; then
 		dodir /Applications/Gentoo
 		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
 		mv nextstep/Emacs.app \
@@ -390,14 +410,21 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
 	readme.gentoo_create_doc
 }
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index aa27809cdc9f..903e4e6b7658 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index 262d7e62ec77..eb2078aabaf5 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -532,8 +532,6 @@ DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod 71 BLAKE2B 5379c4cfec1c33cee99fc39e4c3
 DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.zip 45140 BLAKE2B c7271958036e25fcaebf47cba48efd18029563731e8648cf0e52247e538b9fec5b3afe74c1b3d071927b3cee29553c8a891dcc1cb920a3a3b17e1cacc8887bbf SHA512 f4adb771c1131f778d2b3f9154e8f855f5ad3882f1a932afc7b4457f9413fa43340e993e6a80cb930019a8e712d40fb62542efb524a2688635b6445f8f9dcb1e
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200427153329-656914f816f9.mod 1576 BLAKE2B cf5c64b8ea229cfa89dea8ded6e26d5669f0cafcd0265436060e9fad534df273e44f246bd28203613796e5503bcd245d94a0e70c82d7a1c797abd0170caae2cc SHA512 66bcaee932ce76200d93cacc3f17cc654fb5bf6ab75da30850b9899c3e6b2d000839eef5f33cb257f6a13494dbb69b940c800b6bd31ea7542a69b60276269251
 DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
-DIST kompose-1.16.0.tar.gz 5241785 BLAKE2B 9958b200827b70c94a499981880cc7a5d8137354205d96657d854aefebbd877e332ac3047f59e13b62dd6b9a9235d1ed83bb8b8de973d59f81906b3f376176a0 SHA512 267601ba51f5cfcbb95b9fbf52bbb99f9c810de8edb301b635a50936d7a714dc8410352ff3a4aa8819de1659a45cbb42caf5e552023cfa594a0eb8e99db57522
-DIST kompose-1.19.0.tar.gz 5314491 BLAKE2B c03f7ece6dc91979a147bb1689525318b7c31b22242e6fbf5387469d3196dfc569178235b5a52ccdd9647ceb626be313017484451f149e375edf3b48da063328 SHA512 571c5f23a19ba1f7a403e2369d74a5f6ba051c5e9c27b79bf5ab05f8dfc9abd523862dad7da3cd0d503e4de2e76666cd1eea8d8921b0bbe79db81f11a23fbe64
 DIST kompose-1.22.0.tar.gz 321371 BLAKE2B 6a692c4ff4afc835ec6a3319e266849c6a9d2fda50828586eacc1b3b07c743acef7d3427fc3413af6e6ca8e435fd1e4ecfaef588d9be7091a08e45e4b8e4b053 SHA512 09c2520b759dcc452f6d55b171d9c002ccdab96cf01cd9b67be33070c8b3faff0a189ca30731376386d214002e2c44ffe27715aa74039a8adbae946d2b03d1d0
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
@@ -542,7 +540,5 @@ DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.1-0.20200706213357-43c
 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 sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
-EBUILD kompose-1.16.0.ebuild 914 BLAKE2B 135028b699263569332cc9e7e1d9559ac448ddcae5517505bf170a17b591a581b3513eb9d29deda4d103a93b556ddc2bc77f052b80ab4f786f7f4003254f63e6 SHA512 ad339be916fe398edd62cab08a67c47b83eb91cd91603402520609e9e3dc4218d3ed5d206f386cad75c8b0b0b0a63efc13cf1514166b1eacab9b63663a2e6231
-EBUILD kompose-1.19.0.ebuild 903 BLAKE2B d1f5a72ecb852fbb2e9f3467fa694b643787e65aba01b828f6ef2df55f8e75f803004d333fa24a78e40490373dfbbbcb2b053dc1039e85a749814f54bd3dfc10 SHA512 6fa7d0d3f2e22595ca8ba8f8b7912743202705707698caf190a97f1e678a01d5f803b353c15867109f7de94b6611af5cc1d0d8c9879370e1399ec81673eb0708
 EBUILD kompose-1.22.0.ebuild 30385 BLAKE2B 098889371342d949e80d6262d81122215a58c4030c62dfffe00cbc50ed0a2ef892b8a1c04195c0a40710e64df43f700d1b7d76700a00b9944573cef4b0e4c930 SHA512 d06d603405cf721b6c7dad0ff2d63f8ee79f599a5bfc0b04ab921e52b66cc6ef421f183d00517753d9d4908da818eb243b11a65ac5f33106dba5d2c3589737a8
 MISC metadata.xml 335 BLAKE2B 24f92508398ec5fab539588946b82ddecb9a073de978de961831e2b46b93a47bcbac1ae00ce294f55502d505759fd314dfa00b6bf74752a307d580cf20814fe0 SHA512 832f3b172a918d44aeff813522d1a377f81faadc9c7218011dd832a6cd743d3d1b9bb4e88710fb678527f134b7263854703504143a23331c319237041b45b893
diff --git a/app-emulation/kompose/kompose-1.16.0.ebuild b/app-emulation/kompose/kompose-1.16.0.ebuild
deleted file mode 100644
index 8804d097f4eb..000000000000
--- a/app-emulation/kompose/kompose-1.16.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="0c01309fe899c587e8cb02e9c31196ee66ab5093"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${GIT_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/kompose/kompose-1.19.0.ebuild b/app-emulation/kompose/kompose-1.19.0.ebuild
deleted file mode 100644
index d6b2bc22f6a7..000000000000
--- a/app-emulation/kompose/kompose-1.19.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
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="f63a961ca7972cb243507755c69cd066aa792289"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${GIT_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 1a4bea6a6b0b..c6cec6e1e72d 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index bccbc5346950..385cf3c93297 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,9 +1,10 @@
 AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
+AUX uim-1.8.8-fno-common.patch 375 BLAKE2B 88cf3f86fd23e3d9735c3c12df299c678fb332a39937cad0408fcbfdb653eb6084d3b693ceec42e047c7cfe37a78ea8982d49bd9260135169e4af2d2af64be31 SHA512 898ce37332bd02ccc063facb922a965928962f7ecccbb5e74a57d64069eda235f33f7e899e94f8d48e17a58b32a1e98d9eed2dcd9c73eafd012fc0150eba13b4
 AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
 AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
 AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716e1c27200a9b4d29a649beb333fe61c30cd36718494b05cb5217d486fb929cd617fe7038bf168d7 SHA512 4e86e051dd05ec0b56d423a079b0b285fdd9b256ae66528781a68ee0bfcf1be15530346facb28eab0a1401f2f27f9dce8cc8e215fe3195879f66e7e4241d80fc
 AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
-EBUILD uim-1.8.8.ebuild 5477 BLAKE2B 7f203eafd78f5b77c724a59116af1a154a4633df5712e33eade8de351869a1fcb81cd61f4a50658a885491ef5581f4625ed603f6f780d6b5aac6630c3f354bea SHA512 5c3e6dfc798f5ca600416c69360f8b09ce9d932d9e402d82be2830d8a219e03fd5df9ee468316533ad7348c85e81acdeee9c6cd4c83f7e3747441fc61560a809
+EBUILD uim-1.8.8.ebuild 5514 BLAKE2B 338725d8bc455fc953de4c80aa3205bd13023cf177d398bf7f8f4e8a0cebaddb9334ef5ba6f5e7f112f3b5ceccd9abbe808d2c9d193d534a130d850b7bbcf35d SHA512 f714daa5937cdcab78e459593e16283dc4b45bbcead6e48c3ddafc8fd26966000a9d3ce82234fc4019ee9ff39973430df81f3ffa4f414bd65fff20b36e4564c5
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/files/uim-1.8.8-fno-common.patch b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
new file mode 100644
index 000000000000..ff974bb5d5b2
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/sigscheme/libgcroots/include/private/gc_priv.h
++++ b/sigscheme/libgcroots/include/private/gc_priv.h
+@@ -1979,7 +1979,7 @@
+   /* the signal mask.						*/
+ # define SETJMP(env) sigsetjmp(env, 1)
+ # define LONGJMP(env, val) siglongjmp(env, val)
+-# define JMP_BUF sigjmp_buf
++# define JMP_BUF extern sigjmp_buf
+ #else
+ # ifdef ECOS
+ #   define SETJMP(env)  hal_setjmp(env)
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index 412b439ce31c..3ed23be0370a 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-tinfo.patch
 	"${FILESDIR}"/${PN}-xkb.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )
 
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index a9997c9d8da6..e133f6ea942b 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/rox-filer/Manifest b/app-misc/rox-filer/Manifest
index ec74a95ceb5a..ba26763fc314 100644
--- a/app-misc/rox-filer/Manifest
+++ b/app-misc/rox-filer/Manifest
@@ -1,5 +1,6 @@
+AUX rox-filer-2.11-gcc10.patch 694 BLAKE2B 4f701a9df153045d92490ae590bd001b67059b5956240970594471016607538e703ef09acc6881a9d2995bc8fa8eda059e8bc8232fddd35afd656db6f1c2e46a SHA512 bdae97a9a005b8993ffd96a22d6584949f01c28e1ac1494ad41bc2b20ac8b44d9b60e8f960f3259867455ae269dafdf7fde51e3a0852638a5414aa34eac70b31
 AUX rox-filer-2.11-in-source-build.patch 429 BLAKE2B fdbc342e0f6a7abaf01fe0a2f5411a6aea7a833f2679d9f47a783631443bf2618a4d6be293e5ce14da295713bd7b97af36edaffa3aedbfcea3de513ac1fd455b SHA512 28cb208bc51c500ad766bf832f8098bd44813626be2ed3c50c37d0cff5193e1dc1a4430ec40ee7290befb1f20b4a506f03c8c327760b75e06d08ec646b24638c
 AUX rox.desktop 157 BLAKE2B e13b788f78bb5f3af73e6f9c0e5cc9729b7221cf37a7b1952d78ed9d1f3ba8ada67d523ae08d7280d5152e3e5f0cafbf55e65bbb75d558d4c77b14095ac7fffd SHA512 968b930f97a25c58a0aeee0789161b98b0bfa93978beb0d7e57e40affe45b65940f67b612df93ac64c0c5244de7dbf913b1083cf7aa4a357e929a7f9f4ab366a
 DIST rox-filer-2.11.tar.bz2 1907026 BLAKE2B b1afd0e2df7152bd1160632c0e7eee71c1d3e9140d453f0fafb2d8049b593513db7ca051282ecef2ce06831883d2f057774e3d37175a64d4bd5a8158e4bbb4bd SHA512 2ef5e7a5d6f4bbb825d6f01725ad4149b9cabfb6fe82c33631bb145f5a3c84e345c372b7698170c1ef78b30ffbc4665495cc266da4828cc8b4b256b592b2c50b
-EBUILD rox-filer-2.11.ebuild 2340 BLAKE2B 8edd0494da53afc35242be35c3cba96153755335c1b4d9687addf34ef357eff4c057e63c30bba6c28c984a6751e40aa6c075b98bbc13aa67d77ee853a45d6f40 SHA512 e38547fde5f3d627498049fb8db64aee190fd0a3b9730d2a30474739b8906edd8aceb0389de09defb3589f70338434e19416ed4fb96ec98e0be7c08d5062f442
-MISC metadata.xml 1128 BLAKE2B 16ca555c11ddd1a0de2ac5381be54c415f16329fdf10e6523ab078db320c57f6c35e1656fb1d026ce0615da9eb4bcf08b9f565a5aea34e8a1ac3fbd0b20e2bae SHA512 23fe490bc592c9d4288966aaf41bff4a68605c15ae9778dc1a89f89e5b2fea2c4e0e9c9e12b8080c744d79a5b7d4b7abb534ce02744dc517aaf7af679764b453
+EBUILD rox-filer-2.11.ebuild 2410 BLAKE2B e4eda414d50333d7b3320e71b34591b31753765c237332f7075c555a03e74da7a4825a8e8b193fa895de197c564bebf3d71560c202a6c14109a815a3133e9aeb SHA512 52639330b112b1c0006bdefb285aeb8e192b680af4e4db50e6220934d962dc131498199cbe77c3ad821d2bb0a5b9c8dd8be22224ec8529e263796d29d64f9a24
+MISC metadata.xml 1188 BLAKE2B fb150cdb9a5d058579d48b6c0af7e328693ea8faf80ee0d54272892ccaa9a7095875cae2e09bb8ba72fc6fc1ad834f624230e5f1a1b2bc8a3f88a9ad7f3815c3 SHA512 e4697b62759e1c589a964016a1d18889843e16ada402d7f295fee8077dcef4178c02870f696485079c98d3c18b032a981b6d887741d7e22dd7882d5dec6f9c9d
diff --git a/app-misc/rox-filer/files/rox-filer-2.11-gcc10.patch b/app-misc/rox-filer/files/rox-filer-2.11-gcc10.patch
new file mode 100644
index 000000000000..d969757eb7da
--- /dev/null
+++ b/app-misc/rox-filer/files/rox-filer-2.11-gcc10.patch
@@ -0,0 +1,27 @@
+From 86b0bb9144186d51ea9b898905111bd8b143b552 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Tue, 30 Jun 2020 00:22:06 +0300
+Subject: [PATCH] Fix compilation with GCC10
+
+Fixed compilation when -fno-common enabled (in GCC10 by default). See
+https://bugs.gentoo.org/710330.
+---
+ ROX-Filer/src/session.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/session.h b/session.h
+index 7734996a..31341bc4 100644
+--- a/session.h
++++ b/session.h
+@@ -10,7 +10,7 @@
+ #include <gtk/gtk.h>
+ #include <X11/SM/SMlib.h>
+ 
+-gboolean session_auto_respawn;
++extern gboolean session_auto_respawn;
+ 
+ void session_init(const gchar *client_id);
+ 
+-- 
+2.26.2
+
diff --git a/app-misc/rox-filer/metadata.xml b/app-misc/rox-filer/metadata.xml
index 65dec56d6380..740d871edf39 100644
--- a/app-misc/rox-filer/metadata.xml
+++ b/app-misc/rox-filer/metadata.xml
@@ -16,6 +16,7 @@
 	</maintainer>
 	<bugs-to>http://rox.sourceforge.net/desktop/lists</bugs-to>
 	<remote-id type="sourceforge">rox</remote-id>
+	<remote-id type="github">rox-desktop/rox-filer</remote-id>
 </upstream>
 <longdescription lang="en">
 	ROX-Filer is a fast and powerful graphical file manager for the
diff --git a/app-misc/rox-filer/rox-filer-2.11.ebuild b/app-misc/rox-filer/rox-filer-2.11.ebuild
index 6b9abf2b53dc..966f2750cf96 100644
--- a/app-misc/rox-filer/rox-filer-2.11.ebuild
+++ b/app-misc/rox-filer/rox-filer-2.11.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit desktop epatch virtualx
+inherit desktop virtualx
 
 DESCRIPTION="ROX-Filer a drag and drop spatial file manager"
-HOMEPAGE="http://rox.sourceforge.net/desktop"
-SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
+HOMEPAGE="http://rox.sourceforge.net/desktop/ROX-Filer.html"
+SRC_URI="https://download.sourceforge.net/rox/${P}.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE=""
 
 COMMON_DEPEND="dev-lang/perl
 	dev-libs/libxml2:2
@@ -22,13 +21,18 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/shared-mime-info"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
+	sys-devel/gettext"
+BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${P}"/ROX-Filer/src
+S="${WORKDIR}/${P}/ROX-Filer/src"
+
+PATCHES=(
+	"${FILESDIR}/${P}-in-source-build.patch"
+	"${FILESDIR}/${P}-gcc10.patch"
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-in-source-build.patch"
+	default
 
 	sed -i -e 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' \
 		main.c || die "sed failed"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index e21171d571cd..9b3911cef7d5 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 73423179e8cf..7e3ed5667040 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -37,7 +37,7 @@ DIST libreoffice-help-7.0.3.1.tar.xz 110855688 BLAKE2B 3b0e845087fe0bd25ad3c06b8
 DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
 EBUILD libreoffice-6.4.6.2-r2.ebuild 17744 BLAKE2B f4024ee09916c9568d25dc39170bf9d0a0426934b8ada515c9295ad426b0993c5787bf7687987fdcfe31ae3fec07eaf1a90cfcbd4b87714cd8e0861d1daae035 SHA512 4f2c0a7993d457698e6ea30bb2cd4fc32582167a652ee54788a5785c8baa32dfab924c67413c4cbedd92f411d348762e19b89458166c194a0077b480a117db0d
 EBUILD libreoffice-6.4.7.2.ebuild 17758 BLAKE2B b7ab4b5999623779e9a76787cde54424f2c3d7ef112c5e9af544cbcab500402ad12e82b91433236c68916ed5cd0f2106197bb92854d264c9d39055663bac3f40 SHA512 91c4e17ef404caf7c3ee97a7ae613b7e758cd7acddaa8da56f80adfc07bd960aac0045a9f185067bcf331dc2025f08e09869b630a5f74b26ed99c1c9d78c797f
-EBUILD libreoffice-7.0.3.1.ebuild 19568 BLAKE2B ece6e822dee5dbb506dc7f5c3384f4ef7bc31b61e17db96168736d7b429e3475f006b0224a88eaa64790d26b89d591160ec11e1d4ba95594e58caa16b7e319d7 SHA512 7110e26e3bafe2a093d9213172a28b1c6ff1e5f4c708d836c930cf3209a3e6018d4bccb65106f9de999408d49ce4fbac5234548ee440124bb18756d830398ffe
-EBUILD libreoffice-7.0.9999.ebuild 19468 BLAKE2B 2b8743e26af363888aae618a8e362b3e0d78665821b1dc51de892cadb67d5040926c18e6fb771a5652cf8a717b14312ae486ee7bb38fa1227c69f2dbce201f3e SHA512 96b5ae90f387b9af31a354b1994e1affdd4fc86d78878e1219b6ae2216e5053a27fce6933e2b451bb939921574f4df19136da5d97794d2f9ab39c8bcb137e163
-EBUILD libreoffice-9999.ebuild 19474 BLAKE2B 34cd4cb51f1c6f27126b4a5d6b67eb16dd4fbbd1e43b33c9de580007b0d34d2e054ca8a1aa55763234847b14266df6a6b5ea03c1198c2a0c577958053c3ee13f SHA512 658a596b44569fdfe505943a35673937a8576f3c39993c5708e86c5f04b7f908d64ba5c2255b399ca7076bcc734c3195e5adfd8fc82702c4138e64a4ee94b12a
+EBUILD libreoffice-7.0.3.1.ebuild 19572 BLAKE2B 8a1507ada4d155f8768c29f13ea921bb492941a84745b6b973dd368255d806a949cf5e699df54f689bb72ae72b8f0885f5a64f3694f32753a9d3d563c7dce519 SHA512 7bb064ae81a6505c0bb4dbb88224631fe487b075342de5873494fc56e84070d39650e61137a4fcd9ae35c2470b35d4e5c4b46e09283413ec99ea05257654481f
+EBUILD libreoffice-7.0.9999.ebuild 19449 BLAKE2B fbcdfa003595a760885b6d8c80f2a7de8a22183fa9219c5e4c3e1643615fd646bed1e8c0a4d7dd5c6e261bc64a8e9b578ae03238135c4fa3f6d4b9ba720b06f9 SHA512 3224566e5fe6256e80ae631732f7fb4b4bb8de3f4df6fff808caaf427e7197e5c90c804f87411a8976aaeeab13a7141fb2dba2f8212b3c4f6ed485d3b5e13549
+EBUILD libreoffice-9999.ebuild 19455 BLAKE2B da22edde0ac0dc6687cc2da1a710da4ce1622f0c5023d5fc0ef5752a6d67ff987877f8be52df09460374706d92da119b20a3d51c425b9ab6917603f5360d04d0 SHA512 c01fa5e8df89429642e0eba5b7ec257ca6acc575efac38991203e30b7f7d1231d9028cf8ab1593abbec5d922c30736237c0c239155d51be90a92618ee6b62a2f
 MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 753ef4fb54d4..c2fe022a62ac 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
@@ -637,12 +637,12 @@ EOF
 
 	python_optimize "${D}"${lodir}/program
 	# link python bridge in site-packages, bug 667802
-	local py pyc loprogdir=$(get_libdir)/libreoffice/program
+	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
 	for py in uno.py unohelper.py officehelper.py; do
-		dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+		dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
 		while IFS="" read -d $'\0' -r pyc; do
 			pyc=${pyc//*\/}
-			dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+			dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
 		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
 	done
 
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index 754be8f900f1..b9e826f9b402 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
 
 BDEPEND="
 	dev-util/intltool
@@ -633,12 +633,12 @@ EOF
 
 	python_optimize "${D}"${lodir}/program
 	# link python bridge in site-packages, bug 667802
-	local py pyc loprogdir=$(get_libdir)/libreoffice/program
+	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
 	for py in uno.py unohelper.py officehelper.py; do
-		dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+		dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
 		while IFS="" read -d $'\0' -r pyc; do
 			pyc=${pyc//*\/}
-			dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+			dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
 		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
 	done
 
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 67f8c3b2d866..500abaa157c1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
 
 BDEPEND="
 	dev-util/intltool
@@ -633,12 +633,12 @@ EOF
 
 	python_optimize "${D}"${lodir}/program
 	# link python bridge in site-packages, bug 667802
-	local py pyc loprogdir=$(get_libdir)/libreoffice/program
+	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
 	for py in uno.py unohelper.py officehelper.py; do
-		dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+		dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
 		while IFS="" read -d $'\0' -r pyc; do
 			pyc=${pyc//*\/}
-			dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+			dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
 		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
 	done
 
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index fadb3bf1a684..9087cbc36d1d 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 5f5060062d03..293ff1862e95 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -2,7 +2,7 @@ DIST nattka-0.2.10.tar.gz 90745 BLAKE2B 8553b0871fd96e64af97e68cb6164dd71dad17c5
 DIST nattka-0.2.11.tar.gz 93992 BLAKE2B ad088de5f96ec5f7f8b0922420d22ef507e1e79ef3bc3161e6a88cd4714f1007a000ab06a7e21245b2792fd3056474459bf424da0560b8666c5cf46f04a2d763 SHA512 5d9de9f437a15e149ce58348f40f86101c10fe1f4c4ce869e7038ba25fc212c22e024a9999a6197179a0a1e1e82380356d304841c33333e04949caaadef96db7
 DIST nattka-0.2.9.tar.gz 90735 BLAKE2B f10d3af19785d835e059647e758541c3df5141efbee908fafaeea0492537d10d308020d1badb8fedb6f1baa327d26ad1126f26090b6cab9c75358247cdd47ffa SHA512 73208b15c2787965acd5cd2b14614ee8390da65924d7e3fae66c64a47d697f638df710f7053762e1f77d861e3b84bb18dae454446da698e5b52c1a0b1591bbd4
 EBUILD nattka-0.2.10.ebuild 926 BLAKE2B 031243777104451b9f74422abbd289e2ad8f45a8ab0483c21140bd11e7cb307fac1a6f87c9d11e0f42d2f4805936fedffdedf81a1dba21af060dea1d8d6ac808 SHA512 6aaf0cc3f6f43c70f957d57d9306fdd6e43ac954198ff7f38488dd73c8a4e0256b05c04ffb758c87cf0e28a6b740774ff586b9e01c1d4240bccb968f9f2b9ed1
-EBUILD nattka-0.2.11.ebuild 934 BLAKE2B ea2707d51ddad62f8841323fc04d8610c3a17f06878ffb52e06416906c806628639335f91dc3f10ed9e8400c5278239ad86c7d9e0e496d02ebfb528e7ff816b8 SHA512 12397bfa83da3df1bb94bb7242618b94a01c31173f6178e7772ed9d8cc8b72b5d358b2a0dd3a10c321faaedc9a4f42959a99c3968ed82136e303d5358b58bbc8
+EBUILD nattka-0.2.11.ebuild 945 BLAKE2B ff2fafaf2f711756ba44231588fb864f5ace1f7fa4f7ff90ec2a68fa835c46107cddb106255d07801fc273b20c31016cfe928410a781a1775ebc8b153f0451ee SHA512 47ba7f0a1fe45a99a95ab0f30270868f342ec4bc889377cc83cf4259fae8cc28c2afff1dd624b6322a671e7eada6b82e214ed926c34635fec0774106efc4783b
 EBUILD nattka-0.2.9.ebuild 926 BLAKE2B 031243777104451b9f74422abbd289e2ad8f45a8ab0483c21140bd11e7cb307fac1a6f87c9d11e0f42d2f4805936fedffdedf81a1dba21af060dea1d8d6ac808 SHA512 6aaf0cc3f6f43c70f957d57d9306fdd6e43ac954198ff7f38488dd73c8a4e0256b05c04ffb758c87cf0e28a6b740774ff586b9e01c1d4240bccb968f9f2b9ed1
 EBUILD nattka-9999.ebuild 887 BLAKE2B 79540de21b995147dc8b7c7d43e3ff14a685bdaca82b667b8a1ecc61643341f34e422d7f710a098854faa445242f2a0f8161df58371b9a4412dd9a27c8073644 SHA512 6ebd99d4f683bd6e217b076303d4e3cc46bba3d09e3265b8a9f7a42ae7d8456c37699e405ae3fc60c0adcc9340881ff6beb7ac1bc8757fdb1c32e842f620e33a
 MISC metadata.xml 360 BLAKE2B 81f9162a3ddac3a0f333ee1e33f3012305054a7039b3bab7dedc68caa08d44c355aa40a2e9f61e789ba28fc0c28829a74024fa72476281dc492ef5d39ec62eed SHA512 674f911e11525336a229d3fe80baafa37963479e582ab847d74f70c817b126a10a602ef3f6bf67529b6b2b3d3e576afdc92ab3d2c1e8d1e75407db7a2007f01b
diff --git a/app-portage/nattka/nattka-0.2.11.ebuild b/app-portage/nattka/nattka-0.2.11.ebuild
index c2d438a421a4..167a6660016b 100644
--- a/app-portage/nattka/nattka-0.2.11.ebuild
+++ b/app-portage/nattka/nattka-0.2.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 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 ~x64-macos"
 IUSE="depgraph-order"
 
 RDEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 1dc99b36f2d7..3796eb906d05 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index d273fcb1b95f..4bfc92e4df22 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,3 @@
 DIST ansifilter-2.17.tar.bz2 436116 BLAKE2B 94a1788cffa66343643f48a18748d5359b090803cde723a02bc38f908c262631f1cd2eb150b6a743d66caa04983ea444ba150cf34ce07bdb456979e19631582f SHA512 ab9d590189482f2a27affd62b456c96b947b04d8c8b1214f1ea967971c8ed7df8a7c15d1079f957164d01916d144dcd5dc4b0ac05b452f9f4b8095273d3d3162
-EBUILD ansifilter-2.17.ebuild 1097 BLAKE2B 96ee05ad6f9c695d05f4fd840d27fdd8651920144f983455e778a45669aefea09adc2c1509370a015868ad49a928c808566119ce65bbcd519ab431b21d00a6ce SHA512 c2d4a8f3ef610fbde39c43754a112937f761eac072457f807468166e1ea52cc3f554ba8a197e38b74258a29256d89454256b78faf056888c551796796b711c4f
+EBUILD ansifilter-2.17.ebuild 1108 BLAKE2B c5afc96a41f9b2bf6474f02c61d11763b77bf930c277d5a21c054b3f405115e7c57a52c869e40ed8042ec312e7d17afe7de2471a1460b845f7badc24bf3b2e0c SHA512 125d486d6d5f7e86c894a862f03dd4b0760776dda3b6047c14f28112f34d11ee72601e74ddc3a64c09953eeba7e5de30e3d6725a5df2519fe061251678b84de6
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.17.ebuild b/app-text/ansifilter/ansifilter-2.17.ebuild
index 8f626bc7e4aa..f9b8816867fb 100644
--- a/app-text/ansifilter/ansifilter-2.17.ebuild
+++ b/app-text/ansifilter/ansifilter-2.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~x64-macos"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 80cd03021e2b..f15372d08f2b 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,4 +1,5 @@
 AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
+AUX calibre-4.22.0-icu68.patch 1234 BLAKE2B 255c1ef614728a927893231d0e6ba1b59035ad44c25a62e88880df8cd780c718ae65417e448a74e542d6ff138a453fa0ac907923b85d0a8501155dda0c577f1c SHA512 2e51db19312896bf96ca10189e49b9f92ae58e2573ac0883fbe88d335fb8fa5fedfc435ea402a56fc85e196af1ba5e9cb53a4a966cf4ff9ad3176e6fe56e80fa
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
@@ -6,7 +7,7 @@ DIST calibre-4.22.0.tar.xz 36924876 BLAKE2B 19576d5cfc1a4ed6a505ef46656675980b67
 DIST calibre-4.23.0.tar.xz 36908740 BLAKE2B 3a950ac2b3aade547bb686cc99b963357e76b5931049ecb4a5e09ddaf1db26c74fa3b4ebd74e42d83f68c5c9827c534c0247a3c6a9b000641a778cfe5ac33599 SHA512 2a512f29ddc2fed7f6a229314a9f7fceac198c9422b3be19078685032f1d1cb3b9258ac2609c33d15da20683c1277ed09419ea1e9bbc70430cdc676f60395719
 DIST calibre-5.4.2-SIP-v4.patch.xz 4640 BLAKE2B e8d20d9e23922885ecc3d24b7dd83579911dc83520037bad4e9323725c3127d348dc745dc725d137a3172e8891764355d3fcdee640a26cd6b142a2c26d00da0b SHA512 e79ee69ba0ca7e44c10c6670743889d0391d708e75c798e345e6228f483347f72b070e01e2a258590420a1eea6313d88d816817886747c699e6783bd965ab557
 DIST calibre-5.4.2.tar.xz 36596800 BLAKE2B 00373cdc9af56a8dacc70096d1e7925f8d3da4eaf37727ad58c211d18e6c593a21c3ad0f283048ae28b1bb83889c8c801baaa5e240eb65d972ebc78a79922ec1 SHA512 ef3839f5ff4ceecb3bbd6c84819d6f57cc4bb2a1ae789a9dcf8f029680bc778ef86f9c2eb01832c4990f68c2de892eedafa449205470cec4d86a3bbe9d4b4527
-EBUILD calibre-4.22.0.ebuild 8692 BLAKE2B 7d394fc987120030e3ca6dfc593ddaf103a52983f13bb95e02c063da6ca9c3500f6c1d60148040bb8c19e70d731145b1ef086493f2817b4512b036c95daf8a1d SHA512 4fbd12df71e6ad2371540595b4aeeed833a465d5c9b6bff70d20949d27671a875e209e5d98a84cad0d16176879d8f4c1b7f7dd46427f5e32a7c9fc600d508955
-EBUILD calibre-4.23.0.ebuild 8735 BLAKE2B dcec79565840c0fca422ea5a973072e46a5233b5440c6eaa2db8049151e4110a1dadc8af8c65e43bd2d1010f7dd63a0f39d30192e4fa1bf28a5141753f923363 SHA512 6fde8b0929df69346aa619e2398ea7f43d03984eef2db967e3047e490c22845641883b78b049c59be62b9053f4ba77a29e325138d7c5c3820456d063fbe7b0ee
-EBUILD calibre-5.4.2.ebuild 8659 BLAKE2B 1b5bac25d97ef4543c94a8646fb44c024918f2302286813fefd328b984368a49cf8ffea55410a339aa4acb407a78b165cd9566ac31d35f538561c96aa54ceea4 SHA512 5a533b3858f0ca63fb7e4a1a9abe0cd44906ce9c1cb54e4045c3e802cca147ff78691a83000daa561c4c1a956a5c63ea047c380c86a6e04a51c3b6c8aa62268b
+EBUILD calibre-4.22.0.ebuild 8735 BLAKE2B adf74fa324a846089c39e864c54aed9b6d5f4052042e30bfb70cccc85fc610ea693814c51cc290838532fc297173ee35702cf177f84c638aaf7256bc599c1052 SHA512 daa440fc6cf39b4c579cf4eb73f63e78d54b41416d259f75ff2379f1312275792bf712f5f0c4c52b5a766ad5278d18288c3d47c38d4cde3fdb63256f46b4ec57
+EBUILD calibre-4.23.0.ebuild 8778 BLAKE2B 1dbe826dc0b16f1a12fc43944ac8c5fc25123921b76acb302dd3cb4d3ae66d3cfad4313d82ddba0cc2a6325d4ddb21bd110cc2c8c6d0af3c7db93262f8888795 SHA512 268e78ed7ae47da88ff86d37038040125d42cb10d4c8aa2edfd61e4ea75390f4752bebcf329da5fe007d4f63c224e65aa746a9528f1d32cb420bcddaa3b237e0
+EBUILD calibre-5.4.2.ebuild 8702 BLAKE2B 18253ab47806e3f9b7baabfb9c287a71ba17565825f26701d79d74bb24991c1fdd3016ad9509aa61bcc7ea77a0792a13e65a6975a2ecbae15a0e8764f3a0ff08 SHA512 646e7ffa62759b0f6fb89161c44270caaa7a65d9e7b90369a04f219d94c0f0788eba8c45513a0f631a6f473c378ae2814fd21d1bce021e57234159612149a4a8
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.22.0.ebuild b/app-text/calibre/calibre-4.22.0.ebuild
index 7dca7d16c3d3..317dde693999 100644
--- a/app-text/calibre/calibre-4.22.0.ebuild
+++ b/app-text/calibre/calibre-4.22.0.ebuild
@@ -122,7 +122,8 @@ src_prepare() {
 	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
 	eapply \
 		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
+		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${FILESDIR}/${PN}-4.22.0-icu68.patch"
 
 	eapply_user
 
diff --git a/app-text/calibre/calibre-4.23.0.ebuild b/app-text/calibre/calibre-4.23.0.ebuild
index 2e529363d2c8..fffb7f953b4e 100644
--- a/app-text/calibre/calibre-4.23.0.ebuild
+++ b/app-text/calibre/calibre-4.23.0.ebuild
@@ -122,7 +122,8 @@ src_prepare() {
 	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
 	eapply \
 		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
+		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${FILESDIR}/${PN}-4.22.0-icu68.patch"
 
 	eapply_user
 
diff --git a/app-text/calibre/calibre-5.4.2.ebuild b/app-text/calibre/calibre-5.4.2.ebuild
index 6c46bbdb0639..ca89fb15aef0 100644
--- a/app-text/calibre/calibre-5.4.2.ebuild
+++ b/app-text/calibre/calibre-5.4.2.ebuild
@@ -124,6 +124,7 @@ src_prepare() {
 	eapply \
 		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
 		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${FILESDIR}/${PN}-4.22.0-icu68.patch" \
 		"${WORKDIR}/${PN}-5.4.2-SIP-v4.patch"
 
 	eapply_user
diff --git a/app-text/calibre/files/calibre-4.22.0-icu68.patch b/app-text/calibre/files/calibre-4.22.0-icu68.patch
new file mode 100644
index 000000000000..33cd7830d358
--- /dev/null
+++ b/app-text/calibre/files/calibre-4.22.0-icu68.patch
@@ -0,0 +1,37 @@
+From c211f9b17af410463ce9cfc9b1b100228b51720f Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sat, 31 Oct 2020 10:44:36 +0100
+Subject: [PATCH] Fix build with icu-68.1
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/calibre/utils/icu.c     | 4 ++--
+ src/calibre/utils/matcher.c | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/calibre/utils/icu.c b/src/calibre/utils/icu.c
+index 62d05de310..4e918492d9 100644
+--- a/src/calibre/utils/icu.c
++++ b/src/calibre/utils/icu.c
+@@ -238,14 +238,14 @@ icu_Collator_contains(icu_Collator *self, PyObject *args) {
+ 
+     a = python_to_icu(a_, &asz);
+     if (a == NULL) goto end;
+-    if (asz == 0) { found = TRUE; goto end; }
++    if (asz == 0) { found = 1; goto end; }
+     b = python_to_icu(b_, &bsz);
+     if (b == NULL) goto end;
+ 
+     search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status);
+     if (U_SUCCESS(status)) {
+         pos = usearch_first(search, &status);
+-        if (pos != USEARCH_DONE) found = TRUE;
++        if (pos != USEARCH_DONE) found = 1;
+     }
+ end:
+     if (search != NULL) usearch_close(search);
+-- 
+2.29.2
+
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index 2b6493ed99a0..398b2d47b2c4 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -3,5 +3,5 @@ AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 BLAKE2B 1afaf90f76030c6
 AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 BLAKE2B ca60c0da237260893d9c4d75b95dafde605ac5ef0d01d311f52ca3a77817ce389a3f0bc7edde06f83593bc24ddc0170507898da4cfd57a7aa081884d3be7f503 SHA512 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375
 AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 BLAKE2B e5c8c38c4504e03d7bb003929c3723cc0d15448258b8d0770571f94279e66d565f5c7cf2926cafc0a71f66e2976039401acd6b3486a9a177115b56b44437827c SHA512 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45
 DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
-EBUILD docbook2X-0.8.8-r4.ebuild 1558 BLAKE2B 1bc7891aa410eb53d525090d07eed7cda47428f23603535673e1ccc233ac6e1d0b72d5be393df513f182062c9d05b96535ae312105af27facee6f09a7d7f9043 SHA512 ddcf4fe394d77b250ddcfa4397ea8c69c22638ce22d17754651c643eba8ac8b09e7ce793e97f44359608f04d1dc8b174b08d1ecc9eb56b731e8d66c643d74cd3
+EBUILD docbook2X-0.8.8-r4.ebuild 1569 BLAKE2B 245ff0908e542aa8306c8dccf41bacd4739a4e65f2e62e199aae90822625209d904083760237dbb83292c5d07952bda91c2f8ce3744d4a2bda57cfab97cb1df3 SHA512 f9622a4b9dd9632774378c9aeeec9309832d3b053a7f02519d8d031fa8a195c8fa9f5fae5e3ac2bf1e9d2f2567792101cd7e390400532a21ab355c93dc21c41f
 MISC metadata.xml 246 BLAKE2B aa5c9c8df66314e0c3f156b1f79b96a87103809e228bff9935544e5b0d9e61165dc0bd0080ecb78595e6e93d0e06c1b8c979b47b8a29f6bdae22fc3abe7a3f95 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index a96945848f97..53121b0e749e 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
 HOMEPAGE="http://docbook2x.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index e79a7c2de877..a2c22d11f588 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,4 +1,4 @@
 AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de245213307b154c8c9f94a4f37b952b7509b7768df53459b1724b91e43bdde3ddb4cacf070d02c4a2dfdf33cbce7cff240c5ec7bc SHA512 70e9b77b5e4eef7a790973737be5c330443ae5eb4f54ac7a706e1404073a3568e0dc42eee1084ae5c4fdecff3384d22ff4666f2b0b24d6d28cf5d66ba3094612
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
-EBUILD wgetpaste-2.29-r1.ebuild 678 BLAKE2B 5f24bbc9ad8872c64496427e9ac5b847a68820042b392f39cabf71cd8152616ddf15b61d2a78d702bbc63949dd583d8dee3190812d70e9fbf4dcc4ada3a8535c SHA512 0d3ee7a7ffd77734719fed157502a6e09786a08fc8812d8021ca23acfb4c2af8bd67c2cd57c6980cd22ec184a7b9fd71bae1d164c40105478572d0ed2f7e846b
+EBUILD wgetpaste-2.29-r1.ebuild 689 BLAKE2B 3f803efebbe86ace4e41a78f358d820f2609f534b6b976cecebef1223754be95ec1301f4c7d03e50579a7a2e7586f7092deab40a224a660a2c2c86b38ea8ec81 SHA512 4818b22025d7b3e985479596558a3832371df3df2e5f9862c08eba3011d3bb022a87c3131ac6e421e99381a3bfb09468be133394e1b5470907f21396311bae13
 MISC metadata.xml 498 BLAKE2B 9442c088cf776d11e625be4466d161c7a2103fd34da4aad288a9e7b04297db23c2cf04745d533376fec8649e1ea4936ab27db42963f0e57623018add15182b8c SHA512 e312aefde50dcbe35325de6215d85d82f16d51beb3a5ff1d3e07c5408aeef66dd7a4ee7485cc3f795462429193dd977cb864b4f1ee8a280bb2e2e7f45e521278
diff --git a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
index 0c181457c667..664406626a3a 100644
--- a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+ssl"
 
 DEPEND=""
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 68e8b4e54735..142cf04dee9e 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/tt2-syntax/Manifest b/app-vim/tt2-syntax/Manifest
index 6efd034de562..c9daf0ea4b70 100644
--- a/app-vim/tt2-syntax/Manifest
+++ b/app-vim/tt2-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST tt2-syntax-1.13.tar.bz2 2991 BLAKE2B 07efcef9b28b8c44ff55d970dec2a9bff73c6e67adc3f03e6c09beca5552599b87150af08f82211f48ff79fb595f5324c60d1917a5f0378e769643b80c19b503 SHA512 0e7f5ca2b5dd53598778bb85a76fbb8be52ce789221342cb5ab51a5084c7d679b8b2f5cee4f8f05db9648a5828471eeba3d0367959f09d280d9c098a9c21e52e
-EBUILD tt2-syntax-1.13-r1.ebuild 438 BLAKE2B aeb12344df6e87a51ddda4772d0602c44eee28de10ad800358c7daa30ff98ccd959308a6807bba2021d92ba5d395b2bcbb86b3a520851da6f7253fa352f3c6c9 SHA512 675109e058b387b68c1ccabb00dcb7be1ebf8d22c6521530af9813771fe326db482bdaaede2d136ac36a23ded68319f31dcef1446b62c18a708b6207654dfb01
+EBUILD tt2-syntax-1.13-r1.ebuild 449 BLAKE2B 6459dfbbd1398b1fa5e3d045df78e8c87253b8b83d91021af1d96583bc6ea16a83c3d4d2942fc3c7f1b8c2fcbbb17b8e1681b3f445fde52eaf9454004b62e681 SHA512 7189454b375c2f3ac4c4bc82dea48ba323a4d6c8b09bc30beab9c53e7177d041da881edb9a192f5e6c75760bc41ebac6232333dc91add73a8e9f014770d23980
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
index 791a8d791b15..7dd20ae4fcd5 100644
--- a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: syntax highlighting for perl module Template-Toolkit"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=830"
 LICENSE="vim"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 147acfc15150..2d6fdd97af9f 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/amqp-cpp/Manifest b/dev-cpp/amqp-cpp/Manifest
new file mode 100644
index 000000000000..34e84f6fd92d
--- /dev/null
+++ b/dev-cpp/amqp-cpp/Manifest
@@ -0,0 +1,3 @@
+DIST AMQP-CPP-4.3.10.tar.gz 156600 BLAKE2B 0453259e8d84b223fc8d36d4747b267a84d7db9daef55d13ff31d4c8cf1e5dd8efb87d9f83f7ff7554aa70c5000d6da45187ce03db09ff4c542bd5409d81ada8 SHA512 ef9a20cd066bbefc243d8d58dbded728e0c88f5c47134f835c50dfa01178b53200970333f0d56330c206f74aa7d7691556c3e4693d5276adb7e3bf4e66bcd057
+EBUILD amqp-cpp-4.3.10.ebuild 881 BLAKE2B df9620265df8faa25fda70e29a8139af379ec90e1fa3f0d92b0ee849abe3439002f9eb47c085ea451407db830434b9d030a402d5dbe319a1635be65bc1cc21e1 SHA512 3cf77447f395533ba474137a3f87ea5b0445eb9326c8f1b5e64add515a26c88c39482b04716eef7b3ff890655d07e653bd63a25936c3533cb676560c53062ad2
+MISC metadata.xml 348 BLAKE2B 29b53174f65d22e7ad469c2739a73408704894ace6178af09de74ff9c000cafb84504ca7e2216ce05147445df06395c7e866f17ecde134479d2334a1cb74be14 SHA512 ccb1b80ee5fe043328df1410b25032be9f8e794a5046a6429b583c2e9a8aa1801add7a44ca3a9b0343857ba47aa4717dbbc2a320744aee430edc467e8cffef2a
diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild
new file mode 100644
index 000000000000..ac7156b38809
--- /dev/null
+++ b/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+inherit cmake-multilib
+
+MY_PN=${PN^^}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker"
+HOMEPAGE="https://github.com/CopernicaMarketingSoftware/AMQP-CPP"
+SRC_URI="https://github.com/CopernicaMarketingSoftware/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed \
+		-e "s:DESTINATION cmake:DESTINATION share/cmake/${MY_PN}:g" \
+		-e "s:DESTINATION lib:DESTINATION $(get_libdir):g" \
+		-i CMakeLists.txt || die
+	cmake_src_prepare
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAMQP-CPP_BUILD_SHARED=ON
+		-DAMQP-CPP_LINUX_TCP=ON
+	)
+	cmake-multilib_src_configure
+}
diff --git a/dev-cpp/amqp-cpp/metadata.xml b/dev-cpp/amqp-cpp/metadata.xml
new file mode 100644
index 000000000000..80be568fdff2
--- /dev/null
+++ b/dev-cpp/amqp-cpp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">CopernicaMarketingSoftware/AMQP-CPP</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest
index 0378e89294c2..0b9850ed3457 100644
--- a/dev-cpp/tclap/Manifest
+++ b/dev-cpp/tclap/Manifest
@@ -1,5 +1,5 @@
 DIST tclap-1.2.1.tar.gz 442387 BLAKE2B 413d77f59224dd7751621f32a5712178c4954cb532095203a1eb839c97d20e8651f94f90d4961a47f654d5b478946fb988db66df0d17c8230fde0b771af77405 SHA512 8bd6ee724600880840048c7b36f02d31b1aa4910b17f80fb04aef89b1f1917856d9979ec488edbd457b66d9d689aea97540abb842a8b902bbd75c66a6e07b9b1
 DIST tclap-1.2.2.tar.gz 231714 BLAKE2B 94fc3d5253c08a305e5f75f6b4b7ab556e94980193502b64665ff828609cde20f340e3fe18cef12011da07ae2db2c2bb52a08f112d052d74c45be8290d525092 SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107
 EBUILD tclap-1.2.1.ebuild 566 BLAKE2B bd3c30004fb51a75d05638dc278b5df220d7df31e2c59466b8e62b9053a591b7ff0e46a1bd5a2ec357667893c983e020eb41fffc2ab06cf992c9c8760bc7d159 SHA512 9b8c12bb936f420fb787032854fafa929f1b84b7d6794559a5abf4eb776f51583c41be3a3b780d1272bb4aff3788259f9d324529f1e78059914a9c6f80419a44
-EBUILD tclap-1.2.2.ebuild 556 BLAKE2B 0dc7079a1f4cc5d800b760479ea51b716cf626f9274cdfd441bb60d86c5969cbc583c48ad971a79d9b03d824ee0149c37ede77e4568925283c5e24a55c3d3fd9 SHA512 fcb2c63c094b819a7e452267faa50aef1b28e6f4f9d822afd59330d80cfe34bc6421afd721aaedf3993605504b6e15e188124a50d6b36b4d4ba0de23ee5ea752
+EBUILD tclap-1.2.2.ebuild 551 BLAKE2B 29a37192e9d844be8c6c5f6f7eb20ba2c2a98fa852435c1339614577be0c83c273dbbf4f8f42f5b458d5a8d52a865a2fbfd8bffb03eb7c59cbd84a1ea4e2d262 SHA512 d3fd3f6034d82343f1313e40a3053628a7a127c19034b9598f9066fae9f0c092a37a81075d0f4a47cf4a3ca4c71c4d95be3ae69edb116a47f19b30483da6af8e
 MISC metadata.xml 438 BLAKE2B e325bd7ec0e700a1880e240b8dc045da9cc393b755180b529594e1b65cd888156b059c0391673f69379851f7ffbede7cb49c8749baf8164292fb9926ba372445 SHA512 892cde44dd9d835b40d08872c00b4d5ed9090f1ee6bdfe706a3d387b49a9e3552b3f899653a88a39732601de8ae9be9b8f6057d5d4b06f77d4d5f4b277c49583
diff --git a/dev-cpp/tclap/tclap-1.2.2.ebuild b/dev-cpp/tclap/tclap-1.2.2.ebuild
index 53fcd8f85956..d71a13881861 100644
--- a/dev-cpp/tclap/tclap-1.2.2.ebuild
+++ b/dev-cpp/tclap/tclap-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index db8f24c6d17a..15c2da70eb8b 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/libzdb/Manifest b/dev-db/libzdb/Manifest
index 6f37fd2ba274..767223ea35a0 100644
--- a/dev-db/libzdb/Manifest
+++ b/dev-db/libzdb/Manifest
@@ -1,4 +1,3 @@
 DIST libzdb-3.1.tar.gz 720162 BLAKE2B 2ad8ede7e2a1c0ee831ba546b7756d2688bcde83b537e812c12ab3d42d6bdc13526778ae68b61584a52569f0b42fbeb8462efe379821295d855f585ae3420df4 SHA512 7cf24ccf0f0a938955d8b54af2c6eca8a8f700737beafde9e824129f324511e06adbc11a3fdbd6ad6d9b902fdae6f7caab4e5c1c594d2211be314e3a24c697f3
 EBUILD libzdb-3.1-r1.ebuild 1987 BLAKE2B 7747fd2a24c9f45fbd2713d931a41368369964635466442b452af6a1ea38e1b187d26a424981b76da1a9796dd45a94d00fd3f79a2b43e6f9e855e3b0c6b2b719 SHA512 735b7ed0579a6cdc95dec473f6fc0d15891e51d2068ccedec1188b163a3afa285603a32f68352df88c7cd3f5bc9dc15da6cfb41321b4a2b09efd1231e2dfb0f0
-EBUILD libzdb-3.1.ebuild 1894 BLAKE2B 6247c8d2295cccecb214a306688027b72391e83507ee16870119cd9c7b7c059bbffd07adc62c21ce0a0387c9a7dce5a6df4cba93d98da21507b9ac456e434b95 SHA512 53b3808f028b78f96c05b8d59f7d5d1301bda641afbb0c8f41a36ec28de807d00c0be02f51841602bdfb2d05cd0a79682916d4d82096332265ebbaf4758badd0
 MISC metadata.xml 252 BLAKE2B 607ece46067f5be04418014fa63f92ad521ce98dcd952feb4fcd1bcfcb16fd520bddb62e7f6e14486a7f45a2505cc258067adc1017af98ba9e69a78244bc62a5 SHA512 e7da72c861777d74f6459375f6f43e39f9e4dda779352c3e8942fcd658dcce6f995f016e34a74b331533f1815fba3faa9af024956a804f38a411990878e4bad6
diff --git a/dev-db/libzdb/libzdb-3.1.ebuild b/dev-db/libzdb/libzdb-3.1.ebuild
deleted file mode 100644
index caa64e3ef38f..000000000000
--- a/dev-db/libzdb/libzdb-3.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A thread safe high level multi-database connection pool library"
-HOMEPAGE="http://www.tildeslash.com/libzdb/"
-SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc mysql postgres +sqlite ssl static-libs"
-REQUIRED_USE=" || ( postgres mysql sqlite )"
-
-RESTRICT=test
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	sed -i -e "s|&& ./pool||g" test/Makefile.in || die
-}
-
-src_configure() {
-	## TODO: check what --enable-optimized actually does
-	## TODO: find someone with oracle db to add oci8 support
-	myconf=""
-	# enable default hidden visibility
-	myconf="${myconf} --enable-protected"
-
-	if use sqlite; then
-		myconf="${myconf} --with-sqlite=${EPREFIX}/usr/ --enable-sqliteunlock"
-	else
-		myconf="${myconf} --without-sqlite"
-	fi
-
-	if use mysql; then
-		myconf="${myconf} --with-mysql=${EPREFIX}/usr/bin/mysql_config"
-	else
-		myconf="${myconf} --without-mysql"
-	fi
-
-	if use postgres; then
-		myconf="${myconf} --with-postgresql=${EPREFIX}/usr/bin/pg_config"
-	else
-		myconf="${myconf} --without-postgresql"
-	fi
-
-	econf \
-		$(use_enable debug profiling) \
-		$(use_enable static-libs static) \
-		$(use_enable ssl openssl) \
-		--without-oci \
-		${myconf}
-}
-
-src_compile() {
-	default_src_compile
-	if use doc; then
-		emake doc
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# the --disable-static flag only skips .a
-	use static-libs || rm -f "${D}"/usr/lib*/libzdb.la
-
-	dodoc AUTHORS CHANGES README
-	if use doc;then
-		dohtml -r "${S}/doc/api-docs"/*
-	fi
-}
-
-src_test() {
-	emake verify
-}
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 9f6296dda189..e5eb1297fd00 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -39,15 +39,15 @@ EBUILD mariadb-10.2.22-r2.ebuild 32479 BLAKE2B cdb02077582e1f1e0f6c1739b43cfc28e
 EBUILD mariadb-10.2.32-r3.ebuild 33793 BLAKE2B 4a4986f9ff7b31bb45d44811733bfd8b088e8b48495fe11d85c19cf1aca35e0200ee251ca83756ae340d13c31edffbf2c8788c1a8f89d56e7637cac3e5ecce4c SHA512 4326e3456f0eede25eef07e89e20acda6bd2518b6b395c2394cc5bd96a2d93e148124464583c8cb4cd4d421e33c627fe255722aae35b0ea1352a94d76e3cea73
 EBUILD mariadb-10.2.34.ebuild 33923 BLAKE2B 7162a33040b26b4c69b3e600120035ed6903ac65f32b5c5825c1a3498e49ac327704451794714c9601ae12dcc9ea8c7045827e7d953a08a3ebfa9991d9f31a6e SHA512 5a2f1f7f6d0ef62bf107d9e632ab87f3092070d3f19c1c1f4a2e103470edb25c2532765bf4efdca8cd3ae0bf80914087a85f6f8cbf91dd13f8be51526dc8af47
 EBUILD mariadb-10.2.35.ebuild 33982 BLAKE2B 7ef21094bdf7d2ca822e9a412524c0ce2e6b846df7ad3fd6f1b73d7ca5759cbd07b553eb8b4da19c9f3011264896234f35f3f315ea403db72856b3c73f6fa2d8 SHA512 07bf7b9eb207f463eac9d8794c947c95dd3d69c6b48be4c4f3160afb0f5e417c1b0a188c56588697e1212dd2d947bb8e740b95c5a159e2ba019ca74f70d8d1b5
-EBUILD mariadb-10.2.36.ebuild 33981 BLAKE2B 2089d29f3c71fd63d95591f09250e428806cef8bc6ad167aa1b7d1f9bc5a2c31e19f70e0a19757f5f2701832f7c1c4b6f47e097c6ddcb0fc787f0225ade5773a SHA512 c79a360a5c0d45ea62d4a14ebedf82a2ebf6bfcdfcfdd029d07f55fcc338e23b4ed150a49d263404eccb0473045e4252d7565bdf6f79b90ce02b7f9ab27283af
+EBUILD mariadb-10.2.36.ebuild 33980 BLAKE2B b5b7ce8a22ea2dfc5db2fc8c939694664018b89411576a38bdc73fd1f9f508fbafaf000bb343bee2d571d1d6fa443a3c4fcccc9b9cb5512150d5c1f571fc593a SHA512 992c130fcdb18707ccb6971e481131a6510a916963ad17f276a5939d3bbb73f20adf63725bf1247ed2222df14a6f308b5859ee8927ad6231a5b7011c6779e0f6
 EBUILD mariadb-10.3.23-r3.ebuild 33546 BLAKE2B 27ae00b9b859ce9305bf1be7d52fff5dbb6832d15cfde3c1baab384385157b7c49e04cfb34680bf5ef02024f79aded3fe9f25a82680a1c2282b1bdcbd9469f2e SHA512 df8f2b177c4326abbbfb70cdf1b7a9ded6dea2b669c9c96b3e86a38db1c165c7d833cfdfd4eb27320179233a42f55d70b68b31d4516b8d1e3d3f2eb9ea32e627
 EBUILD mariadb-10.3.25.ebuild 33436 BLAKE2B cd1b2d506f840723eb23d5fc94c8437936bfc8eee80483e02e18e6541ceaa78b11bf6fb5852bd8ac111f135207591b7d34e073e82dd58530b2be31c6b521b352 SHA512 f610b4dee441d4319b2a92e177125fa1c9afbb4bb86f375e229bf573623688f123007b90ed67429ae186ebef7aa096d4c372617cb733a089938e514d56b87364
 EBUILD mariadb-10.3.26.ebuild 33495 BLAKE2B dff7db9059f564f92427cf323a8008a493fd2c8f9d4e23778d7c6aa2fd79630e217c78e02074ed0e40eef40a16d620d1c7fdbe18073854dd6576906a2b014852 SHA512 c7934e0584da68c329aac1c1721bfc125308af629b1228a70bf9466f26e031b867ea8d713d2bf22dc92dd286d99943b6db0d63fccdcffd63d434cfa5f2373b76
-EBUILD mariadb-10.3.27.ebuild 33494 BLAKE2B 283063810856808801bfcd94b9ee761dba54dc849c97a99727deea516804711d7fd02dac8f3fc648c0f9b5f2ce7ae93a09278028c88eaa096bfd0d795e004b55 SHA512 1a5e170d08fbeb84a8a2c2a20536e3ee800f3bd9954195da2433984cc3b55d0c10036c1fd6d217e13e0cbbeee15dd819e2265a2825fb861f5ec08a7462be12e0
+EBUILD mariadb-10.3.27.ebuild 33493 BLAKE2B 0e47703e453910d9952f99ba1dfac63042a1dd8788c2cfe6236c3d84b86f134b840dd0bc6c70ff97113a64826d7b402ef1ac5b26f4172888018e8dade77d97f5 SHA512 8b942d8160881fca86b9e2c709ac698e1607bd0ab197c8a171b71a6e1cb30eb78c1f155518e73aed8a0ae85fa72fbda239c3c6f1d4130e952afc1c1931eced98
 EBUILD mariadb-10.4.13-r3.ebuild 34110 BLAKE2B 98b42eef162b1d731ed7ac7fe34df39c6c396b4247bece5278d69688a723caf044b96614c5ba06156bab55163428cede02ba37a4da63723a59850d41bed2c5a6 SHA512 ea895b77a66849cafa1e830ad386bbe2eadb6f81b5a62e01344efd34c98e59236bcda15e336f965486be87f89fe002e39d1cbe7c5b65436a2143a9fffc42e364
 EBUILD mariadb-10.4.15.ebuild 34141 BLAKE2B bd40fef84dc3c6c32950be114da95f68aca90d4d4150e117070f9102b441c80cfd105fa06c441e3fcacc965a2f6bd402bb736e957476b41ae77f2e40967bc978 SHA512 95538ccddffd4f47502753bdcb7960c4c11e92c74741bfa3c377fb986d31531c441fa485ffaae09a3b3128da62a70860e74383c37a070db58fc0d93e2b233e61
 EBUILD mariadb-10.4.16.ebuild 34274 BLAKE2B d62e06006a56898833b5357c3ed74a00adb8b5dfdf7d78014ef42080e5bb56242f68a492adfcaf06f371874a3a768f1599f6b8e139730659fb89baf128054a1b SHA512 5c0066de814b431618b7c1cd4264c7fd61861a54f8641dbb21bc3bd2edd3e58c11e84cb81010818815f4df2bfacdd2bec0b1cd49cc37396acc3402ab0aa7e2f1
-EBUILD mariadb-10.4.17.ebuild 34273 BLAKE2B d20943ca0d475bf6f6a553571f209bc4d5f1b46292905ec9c3e3896eafc1cfb78d7d6760015a5b01bbe79b70d67f278376a8c287a53c3d0263b86f320b43c5eb SHA512 03b67c91809e39305e79427050dfa368fc3d32bbaea7a26168258e111c972ce8a092f9f2ab1fd98c7cb0f119fd5cbc907f6198816cf5235a0d21d4c10309d02d
+EBUILD mariadb-10.4.17.ebuild 34272 BLAKE2B be38701c054b82cb18e1946c36f4fa6090044b3a92fb98bde93c3e87168f5534e8debb584f8b03dc6b4715de61e721957da31a758287d0e3ba1d828283dd70a9 SHA512 faa3f1cfdb31ded9c2642958b5c685eb7359366d931048d427c8f12a0ca6d9c1d10ff5ca6d5ac4a1a341da3f4cce50ea436f01f34c7cdaa79d22516d7d39af94
 EBUILD mariadb-10.5.6.ebuild 33569 BLAKE2B 948155fcd9a64f2a9280875bf0f3e99f4b1f64a400a67c2c8adaf2cf13f116ac11554eaeca80e34c53b86a8f4dbd606116d48c11ee80af2738ad892a72a35324 SHA512 d0caa1cf0a21456cbc5f94bf144e279ece57a4ac0c14f4a6d9876df6eaa05488f2d6084cfbdfbde2d4062d1926acf62e64cbb28b2bcdeac6f07bf77bd851d094
 EBUILD mariadb-10.5.7.ebuild 33702 BLAKE2B 60eb424a566762d0fce3801bfb3711528f86ac4b3bf8d5cf75f2ef51805b6a0905764357004445a58fda3a0c8b3f14e482db0e17990ecc07d4b21cdb47fc55b4 SHA512 bbcc467b26975ff33ce282f6b89707ce796e117d7be1266290edcb15fe9609aa0b12fb9dca7a3c04a8c7bbc5c50beb662c7015b6788c77e93c8946145cb99d21
 EBUILD mariadb-10.5.8.ebuild 33702 BLAKE2B 3f655bbc8faac513312676679e452267c632cc10e9500b9bbf1c5b2175b60ce6d006c7b7e777865bb8c96a36e9f199d6b90312234fa3001ddc0b054b3be33239 SHA512 ca26d9a5d5ea810e6d99792302119d4559dfc22f6422be245e386cf08b6e6ebc1bbd72a205ef0fa115d3c93944508d5fc355d32965d367dbaf1b28d5a94d6b49
diff --git a/dev-db/mariadb/mariadb-10.2.36.ebuild b/dev-db/mariadb/mariadb-10.2.36.ebuild
index e001ca8c8860..4f918f208c08 100644
--- a/dev-db/mariadb/mariadb-10.2.36.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.36.ebuild
@@ -33,7 +33,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-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/mariadb/mariadb-10.3.27.ebuild b/dev-db/mariadb/mariadb-10.3.27.ebuild
index 81597d3cfca7..995a71948272 100644
--- a/dev-db/mariadb/mariadb-10.3.27.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.27.ebuild
@@ -33,7 +33,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-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/mariadb/mariadb-10.4.17.ebuild b/dev-db/mariadb/mariadb-10.4.17.ebuild
index 0f9094b3d05b..40a8b9116d78 100644
--- a/dev-db/mariadb/mariadb-10.4.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.17.ebuild
@@ -33,7 +33,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-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-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 579018072de1..6c510803848b 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 9a6ba3b77598..d5c9c2f88daf 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,5 +1,7 @@
 DIST esptool-2.8.tar.gz 5399875 BLAKE2B c2c27dc44cec1921f2d800347682bb198be76f7a122fd6a0c9964fb189350980557aa85bd6cb8fb2d63c8c7ccdd18e1860b65ca85c8777145ec1da07da886be1 SHA512 14528197e760779f3bf50e2a44d477979675dd42451fa405e2ae87502158b21f999fb94561980c9eb0634d2d1fd3729779b78266403de858ed1d32e8d29604cc
+DIST esptool-3.0.tar.gz 6628258 BLAKE2B 613bdc4c4d0df633c25c83d51a84ff9ca34d5c345f010d2e3e99bc126530d484bb1fb4818b3a10b10a6b9879b161817d5bc6288dab55368f1250a27e2418d641 SHA512 b522d30b11e9ab4e426009116bf1872e587116b7a3b517f841d34d3e860f6454345be89a2e28b8eef5aa5e59318e991504697644a3f4f90d7e63c037025716eb
 EBUILD esptool-2.8-r1.ebuild 1148 BLAKE2B 1ffe134f67498ebf26389522948edb65a2e8e06ebc63f796c48a7517fe31605ed3fa2bdde1300b1cc666ee3d27f0d95cae2fa43af96eddacbfa53bf9461c27cd SHA512 58bdaf97160f5a6a3c58c2a26108d44da8d3d4e72bc6fc16367a1721ad65279805bc9bc7640ef544ade7016fff1d00fcc1d56068ca4f0c21177c658699259d00
 EBUILD esptool-2.8-r2.ebuild 1059 BLAKE2B 37365b84e82c73e9c51e42591dafc20199754cde54a966adaed96bbf299ea7c95cd4a53a6fee9fb9c4dfe87f6d03f5f0e1d1a50b98169a8c8f7202944b8c5d6f SHA512 5f6ef3f0ec3e326ae3d4cbac21f4a60d6a7cdcc490605097468b7255e08929c2f36f5d327b82386e0d6764be73e5a558eb1089f14f269fe566bddf21c6481011
 EBUILD esptool-2.8.ebuild 932 BLAKE2B 7d44a50eb5afacb3789d7a77e643c0ceca943897c4deb9b023cb5b39e9cd8547db866e9bc76ad80f2f6605611b25fe74ab59ffbe5605eccf6d21a6ee3d9e66b5 SHA512 d009ce38349452e01a062b3c042422c950e65bb6c0dab35979d9efd8428a552e250857527bae6a992e862578972c130fbcdc5641c493b3c25eb36c30cdcafec4
+EBUILD esptool-3.0.ebuild 1229 BLAKE2B c442bfe64ccdf3c6723bf234c56720b6845740c97d36cbc9894f0f17c177543d9607df1bfaf6ac30b62dd15c893403dcda02397149e9cb61846c6f8ce95e10f1 SHA512 73607e5b0ff888a70789a78e05251a0883504874d324267ce59de8f03cdb119ff9acda3b3f1426f7a3c43657447252427d73c4c07786546d364ea489769bd059
 MISC metadata.xml 473 BLAKE2B 58b09a7777e3c2c04d7932bcfb631a8cbd0322cc81cc35a0871fdc8843f0d3d376b42bb2d7cacd5378f1d7e0f497f0989be1381ee9e8dd3513a899a9ba268199 SHA512 6029394a2639f610b705a820bdc92eab6849087b6964aac46e1aa9a2bd897f06e45919cb32441115081c3ce26097e6a083d9826c43bb7da86b2859855e7f9d67
diff --git a/dev-embedded/esptool/esptool-3.0.ebuild b/dev-embedded/esptool/esptool-3.0.ebuild
new file mode 100644
index 000000000000..d66949a64efa
--- /dev/null
+++ b/dev-embedded/esptool/esptool-3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
+HOMEPAGE="https://github.com/espressif/esptool"
+SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/bitstring[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/ecdsa-0.16.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+		dev-python/reedsolomon[${PYTHON_MULTI_USEDEP}]
+	')
+"
+BDEPEND="
+	test? ( $(python_gen_cond_dep 'dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]') )
+"
+
+python_test() {
+	${EPYTHON} test/test_imagegen.py || die "imagegen test failed with ${EPYTHON}"
+	${EPYTHON} test/test_espsecure.py || die "espsecure test failed with ${EPYTHON}"
+	${EPYTHON} test/test_espefuse_host.py || die "espefuse_host test failed with ${EPYTHON}"
+	# test/test_esptool.py and test/test_espefuse.py need real hardware connected
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 69b9e7b792a1..2eacf8f2948c 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/xhtml/Manifest b/dev-haskell/xhtml/Manifest
index 1d51f9104246..72a47ae1a49e 100644
--- a/dev-haskell/xhtml/Manifest
+++ b/dev-haskell/xhtml/Manifest
@@ -1,5 +1,3 @@
-DIST xhtml-3000.2.1.tar.gz 14555 BLAKE2B e6617914fbcf4ea56b7ffbf7790305fe6c89a27f2a24a50e54cf8a13d57c5bfe66731c47bf41c3163698ae6ce98a8566199c952bca9df22ead5e1a8d9d9a2cdd SHA512 a3e901f6173e3885717ee5e451f8ea8d2ee61cbb159335eb69b0a7e097dbad350b1919aedd7f9daf530147fea7982921fc324df41112e69ed362d143fe327342
 DIST xhtml-3000.2.2.1.tar.gz 14647 BLAKE2B e1e0bf0e0f9927fd8299e67925b45caa2f265302ec940c6ec50ee464bb2fecf94d9bd14d4ee5909d7ae1564a71d1891241ecd99598a2a9757aff45b8caee8714 SHA512 0843042fb40e11ad0f47100fbead8a6eadf2d9d1d8d530195cd5100d9a2a9b81a8cf5118bcce40239e5f4fc3875ac7809791b32d19055c6fdf0b4d0cc72b207d
-EBUILD xhtml-3000.2.1-r1.ebuild 787 BLAKE2B 8a19ee7cb5fad968f20a1770ddd24d83ace746b90b37af32e4431c95a7be9c1e48b04816ab0b8d8442a000e937ee1972e081de7da9ec7b7df3bfb3090b5d974f SHA512 66dd8c595dca9f40e9f28907bf1bcca49033e23b4fd192915605714e165c187c0921db78957310e4466e9e73e4350148ccbbdb7bee9a0e905e6552538e93df56
 EBUILD xhtml-3000.2.2.1.ebuild 695 BLAKE2B 5687e7a9bab589c8bd56515af32145016852c8a312a51f6d01045730653f28d333e43c8a8bf9401d8e5a2885cb4dfcf4fca79465744b069e5bfa901e7aaefd10 SHA512 fbbac568878f53acafbbe20e00f036bc6017919f789a29b773d699a7ac001cf7aa0cb020431656e1ba62dc243ee6df24ac56800d4eb90abc27b50176f146d1ab
 MISC metadata.xml 305 BLAKE2B e7048400b3dc0c789dbb2c34c23f18373deee9b55f53ae669b3d55f1aed654e486fc258fffe9f733fa688600069420adc0496627ced8d08084e7774e5dbe5b70 SHA512 0270a7ac1593d87c819597c6adf0c5658415e1338423c2c1cf254c8d2b9edb879b7776114600ae034b4b667ea42b53b1c372e8fc09c944a017303bbe04ea3453
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
deleted file mode 100644
index 182e71d969f9..000000000000
--- a/dev-haskell/xhtml/xhtml-3000.2.1-r1.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
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An XHTML combinator library"
-HOMEPAGE="https://github.com/haskell/xhtml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
-
-CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4 7.10.0.20141222 7.10.0.20150123 PM:7.10.1_rc3 PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3 PM:8.0.1_rc1 PM:8.0.1_rc2 PM:8.0.1_rc3 PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 8ae915b493e8..7ee97c401620 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 69933f5f4adc..b21c33589fa1 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -8,5 +8,5 @@ DIST jsonnet-0.17.0.tar.gz 21854054 BLAKE2B 91561f2cffb5c711d4ba58aceef90bbcd654
 EBUILD jsonnet-0.15.0.ebuild 1362 BLAKE2B c964f25e046778eebe7b12a3a9f72e057849c33a61b2bdfbc8e188000b4ecd81529000cc88abe04a69b440ced1ab9453bb1db462e5ae4ed7a72426e4d4f0ad3b SHA512 a4a3610b032b23d3a1344813233f174d90096a26d2fc13742b9509899267038bef5833b7c8f74ac4da7756e40378ca2def4fccde72144971b4edb63dea2f9f55
 EBUILD jsonnet-0.16.0-r2.ebuild 1602 BLAKE2B d7ba07b9662666004038acb58c03c0d28363d9d6d97696b264660e4f1e447b17cde2a9e5a55745a6b27d1885fc8be653db971bb80404ef72dc2c388ab3ce0614 SHA512 4ef957e74620e6e8aed5ca5e02fc08bfc6bfd28d8ac091fe37a15790546f048a2eb5f2585958ea3672c2961bea22787349fdf53b4120f1e1a75ac5b040d95e6c
 EBUILD jsonnet-0.16.0.ebuild 1378 BLAKE2B e8fc96ff886b9a5dc5897aa16217db15db8f1af1aeb53d14dbd0c2fb41f9dfa4dbb73ce3b1713a449d50b3118a15118fa3ce2b6a6b238e2eab437ff7189bf474 SHA512 e8756691fd5cfaff0f81cf499f909fe98eeb05a9951bb2a237cc4afad5d530042de88f914a0e971a44f17bfa3dcf733d77520b3a7760482a739026e43375b1dc
-EBUILD jsonnet-0.17.0.ebuild 1489 BLAKE2B 1b7074b2d42f0ffd14e09d07fe8964a48b631f443f5b9da3626060730e76ee19697502051c60c4f9acf12fe9d9331cac4bbcb95256ceddd0c71a273a6680f80a SHA512 b5aebc387ef33682fff935bc70ec99373fa59db490ef69e688a1aea4aa95610185955876adf27f1c455170d1edfd1701b739eacddadd392dddb40e22883cf58d
+EBUILD jsonnet-0.17.0-r1.ebuild 1753 BLAKE2B 8926b856d4206e4e6e877b3f93e393d8c456336e7f01ad99a3fc486e18c3cf8dbc52121440e3d6a686c251d890a11b78c86ee8ceabe16374be320c0351126faf SHA512 7166f16f6297ca3a8e96cd2e8c125797f93b9b63e7c25df554869efc2ac479e96a7a1d0269b97915c131e0b8fa228a612f453f0bc56db23d116b8f8e6f6f6cc5
 MISC metadata.xml 621 BLAKE2B cf9e06f9981b454578c1769425dc15a7a271063b2a95c296db1326c4b4ce0f93ff96a2df42143d9d6fb8e1e196039a26119c35a4881c7d6b2241b58b01cdc948 SHA512 ea583ea6df7d0994e13bf01fff4b99b65ac288e734d41f52bffa4ae8a83d27196622074a6a29bfbbf190125a9cf29e6602f5b4a55ccec76c6324f3ac0b1f50ef
diff --git a/dev-lang/jsonnet/jsonnet-0.17.0.ebuild b/dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild
similarity index 73%
rename from dev-lang/jsonnet/jsonnet-0.17.0.ebuild
rename to dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild
index 67a0000cab80..3faabad2b33b 100644
--- a/dev-lang/jsonnet/jsonnet-0.17.0.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild
@@ -4,14 +4,14 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit toolchain-funcs flag-o-matic distutils-r1
 
 DESCRIPTION="A data templating language for app and tool developers "
 HOMEPAGE="https://jsonnet.org/"
 SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="custom-optimization python"
+IUSE="custom-optimization doc examples python"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -34,6 +34,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 PATCHES=(
 	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
 	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
+	"${FILESDIR}/jsonnet-0.16.0-libdir.patch"
+	"${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
 )
 
 distutils_enable_tests unittest
@@ -45,15 +47,12 @@ src_prepare() {
 
 src_configure() {
 	use custom-optimization || replace-flags '-O*' -O3
+	tc-export CC CXX
 	default
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		jsonnet \
-		libjsonnet.so \
-		libjsonnet++.so
-
+	emake bins libs
 	use python && distutils-r1_src_compile
 }
 
@@ -68,8 +67,16 @@ python_test() {
 }
 
 src_install() {
-	dolib.so libjsonnet*.so
-	dobin jsonnet
-
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" \
+		CP="cp -d" LIBDIR="$(get_libdir)" install
 	use python && distutils-r1_src_install
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		docinto html
+		dodoc -r doc/.
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r examples/.
+	fi
 }
diff --git a/dev-lang/srf/Manifest b/dev-lang/srf/Manifest
index 0107734d0bc2..7e5cc3f66010 100644
--- a/dev-lang/srf/Manifest
+++ b/dev-lang/srf/Manifest
@@ -1,3 +1,4 @@
+AUX srf-1.0-fno-common.patch 215 BLAKE2B 259a699027b336c2fc7ec85132c6dda7a5791ab85aee25ed831402b1fdb82ec6f986bb39db455fa4bd20b9967c4efe073bcc40ff331a413801557c0c2671d15e SHA512 5060a4d68de1dffc2513799f72e157e2456045d63546f3fc0b79aab2f594d5eb0ef5f504269842a183737a430ef135d9cabdd44dc12ef6c80648e6c9a5ec7ab7
 DIST srf-1.0.tar.gz 222493 BLAKE2B 09fb3e767e04ac735245e973d225616b0e527aa2ded49c9350c592284e2ecd840b439af61d27e67dfa3c932a320de787c371354503ed40a8af2a686dcf87b127 SHA512 420f691a937fa30220cd436faaf75299991452fd5f026dcc7aaa767e276eb245cb8eb88d875911826b66abad62fa10326b694301b4372b91e4ac20bf32c78388
-EBUILD srf-1.0-r2.ebuild 629 BLAKE2B 3e72fa3373730aa826cfbea98ba46c6c21fc4c114455ef95de051bcc91c10d97890f8e8620e396e2b0b7626085478cf5ab0f5426582e0a62b7102519b03930dc SHA512 9e8e5af3601a02bc7d8045c03fb3dd9b30d9f200f824d3866b252fa22bec260592f8568e396e970ed1a33fb478aeb52895614647e5221f42fbcc04a2746a7821
+EBUILD srf-1.0-r2.ebuild 635 BLAKE2B 06ee8161591732a1b5517139f6ee537b375e74e461e4d5375bbaa69db99ce07fbc84522739e519ade664f1e9dee9fb830d49642a4308c52b104695ae0843410f SHA512 4d4a6fb8496dc851319496197551f790e2193451e228d942608f8e5231a22742184c0b28b71e2c52e4a18095b3a49df18146b11cbea857b69f12782668218a31
 MISC metadata.xml 418 BLAKE2B 53a8d8a67492aa4c363751eae8327f45c17cd77e5ce1cc9dadc8e017397e4f569150a07e6e20ecc4c411b7fbb3fed8b4690bf6367067360e03d7a74aa2079df3 SHA512 16fea93364e4fbc9deadade67c2d2a69c45f53607315659b0c682497f8d01ce0f85a808e592cb3d67f521b5fa12f9b73b427d030923da4a735eb83baa80473b2
diff --git a/dev-lang/srf/files/srf-1.0-fno-common.patch b/dev-lang/srf/files/srf-1.0-fno-common.patch
new file mode 100644
index 000000000000..abbd5c741910
--- /dev/null
+++ b/dev-lang/srf/files/srf-1.0-fno-common.patch
@@ -0,0 +1,8 @@
+--- a/builtins.h
++++ b/builtins.h
+@@ -20,4 +20,4 @@
+ */
+ #ident "$Id: builtins.h,v 1.4 2004/11/02 04:39:39 bediger Exp $"
+ void setup_builtins(void);
+-int primitive_call_counter;
++extern int primitive_call_counter;
diff --git a/dev-lang/srf/srf-1.0-r2.ebuild b/dev-lang/srf/srf-1.0-r2.ebuild
index 75e62c66f6f8..949fee4692d3 100644
--- a/dev-lang/srf/srf-1.0-r2.ebuild
+++ b/dev-lang/srf/srf-1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils vcs-clean
+inherit vcs-clean
 
 DESCRIPTION="The Simple Recursive Functions programming language"
 HOMEPAGE="http://www.stratigery.com/srf.html"
@@ -12,12 +12,12 @@ SRC_URI="http://www.stratigery.com/srf.html/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
 
 DEPEND="
 	sys-devel/flex
 	virtual/yacc"
-RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare() {
 	default
@@ -30,6 +30,5 @@ src_install() {
 	doman srf.1
 	dodoc README srf.html
 
-	docinto examples
-	dodoc examples/*
+	dodoc -r examples
 }
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 60f940595c45..22b6e18f2551 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index c75f4b8dcdc8..b6caaa2948aa 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,7 +1,8 @@
 AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef39573754ccb0e0e86b5b7d7f26937c6ea54d655e8482ad9d7a2ccc64b5c8a8640d4e71390b19b64a25bde76b3d63d SHA512 e4e0eb9f953285f4221f2733a3a76c23e9e72127ce3ac0ecc67a46a9e37236dee352f28b7b9befdcae9e2f95297e01a98e0dd177697ee6335145ad5088d2f00f
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
+AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d12941db39980abea1fff2328c112196b62cc89d521e8cc2a1f7c11b58816401a838bb8fcbe50036e80d3d9e4343 SHA512 5d605cc1cbbd16221603a9509d07713d64201f4fc1a372d29c18f8d49a4618fcd7e0a0bb0a459024a288e5c2c339a9aa0849abe88691ee2cdb24b92c9b61e290
 DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
 DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
 EBUILD icu-67.1.ebuild 3335 BLAKE2B 355e74e20aee373cec9241a9b080f610f8c29461b0636c04767c7132826f34346532b15c45d027fd27708744063efaa7163e65040b8b1612c679056c23a66290 SHA512 30ed94fe4c6fb563e2421921b33d2bc5c0066a80f531337861fb0d1614098d4ea411bc58dccd1873296c2d6e39ff39cea8d8402059135aa5fd07fab18fe57602
-EBUILD icu-68.1.ebuild 3343 BLAKE2B b786864541035086d91e701ce101079e25efb10263535b623d76d1a25be63d19315f02c2d7c83007f191e020708d5f91f472967823ce42c17da2dcba0cc298a4 SHA512 02ffddad997ede82780250a3e81fbd4a2e857ce77a0687af22db146f93dc2eadd0cb855a1669ea9ea08993486694996fdab3b53c73e40bdbc401a40a4915d102
+EBUILD icu-68.1.ebuild 3386 BLAKE2B 615a1f49dd938525623ce8f084e38feae5b4155e394ee742028fa3f69ba69ff79a82b8d068af96d9fb2d145b050223e7d31521f32f08ccf344b997fcfe3a8681 SHA512 185c6bf733b5030533dd683c634cfcce13a4966135d7680384946a516fcd5e327268ff941f9d71948803fad1f21924c5049aac992d7b07147ea8167b62f38154
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/files/icu-68.1-nonunicode.patch b/dev-libs/icu/files/icu-68.1-nonunicode.patch
new file mode 100644
index 000000000000..e02c1413d996
--- /dev/null
+++ b/dev-libs/icu/files/icu-68.1-nonunicode.patch
@@ -0,0 +1,12 @@
+diff -ruN a/common/unicode/platform.h b/common/unicode/platform.h
+--- a/common/unicode/platform.h	2020-10-28 23:21:12.000000000 +0200
++++ b/common/unicode/platform.h	2020-11-28 20:48:53.223629867 +0200
+@@ -649,7 +649,7 @@
+     /* Use the predefined value. */
+ #elif U_PLATFORM_IS_LINUX_BASED || U_PLATFORM_IS_DARWIN_BASED || \
+         U_PLATFORM == U_PF_EMSCRIPTEN
+-#   define U_CHARSET_IS_UTF8 1
++#   define U_CHARSET_IS_UTF8 0
+ #else
+ #   define U_CHARSET_IS_UTF8 0
+ #endif
diff --git a/dev-libs/icu/icu-68.1.ebuild b/dev-libs/icu/icu-68.1.ebuild
index 50248a6dbbd2..e13a81c1b337 100644
--- a/dev-libs/icu/icu-68.1.ebuild
+++ b/dev-libs/icu/icu-68.1.ebuild
@@ -31,6 +31,7 @@ MULTILIB_CHOST_TOOLS=(
 PATCHES=(
 	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
 	"${FILESDIR}/${PN}-64.2-darwin.patch"
+	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 81450c4f305d..845ca266beb1 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,5 +1,5 @@
 DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
 EBUILD jansson-2.12.ebuild 817 BLAKE2B e517e55debf4bd3971c2d93b906a1081baa510222deff3e2c8e09388e28af1891c3d0d43b6800abdbc33b6380bdf5627a8409f6da21d2356c146fb6c2155427f SHA512 500d974d2708280e1ae4a157e39034bab3b73ba56e4aad3ed7ed6e9942165b31500fb92fafcf0b94328fa863ef2c01308069fa1f6f13cb32dcd6287913fc3b2e
-EBUILD jansson-2.13.1.ebuild 889 BLAKE2B 4a291ece01c4820ae413d675423d6591c8a8177a955c17c13f23bb5d2429d2395efdea6eb1613bce46f7b2584104734aea092f896df00ccc0efe8c392491dd45 SHA512 9d98f73be1db6e8d4492891047c1dd3ccd02a6dbe716d42baef049e04f1c7871a1bb62a38bdc90eb630b77db9b23ab858134a94b046df724f7c77d13f62081e2
+EBUILD jansson-2.13.1.ebuild 900 BLAKE2B 474ff8e775505791709913bd732e51b66a501a63486ef1ec13f6badece49f5a1fe6a7a333ba6b363ae5e029d8a64532ed6ef147a82a3a3e5b8b4f694585de602 SHA512 703c4fc7e791daedd3a2922c8b5e1b89a487ef033cfbcb12df13472a22c3315e5ca370c14f75e6de4ee6ca562d377c905297f45e8f17cb5c54704704160328d8
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.13.1.ebuild b/dev-libs/jansson/jansson-2.13.1.ebuild
index 00eb6d74fa27..696d47604721 100644
--- a/dev-libs/jansson/jansson-2.13.1.ebuild
+++ b/dev-libs/jansson/jansson-2.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
 
 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 ~x64-macos"
 IUSE="doc static-libs"
 
 # dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 0e4d95ce7954..1fafb885f2f3 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8 SHA512 f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
 DIST jsoncpp-1.9.4.tar.gz 214057 BLAKE2B 9a8c52e5d0b78f1593c93bc40f48d3789b031ba0da519c99cce17f1f6e104b24e0ffe88138c25da6dfa250586aeb9e98d00fbf74d9fb9309b29a6d4f17762263 SHA512 adfd4afbdf6b79bd37edcf0e248f07864994f1c4bcb7431f3b44102490ce467f72381908066655fa486dec12f467af0a11f42f859bbf719895974c7339db7d22
 EBUILD jsoncpp-1.9.3.ebuild 1026 BLAKE2B ba65cafacac63ce802717de8e05e95108371fb7489ff4bd4a29c4fe098ab8fb50fb559b7b284a6c402f42686ba3db2758d62983f4c86d8f8b67c2ced72b15aa6 SHA512 9d6d9e5fd9e45605a5fe24c5f738c7e3bf7b5b2bdcbb67ad4ff4c2abddef1abfd54c2efe4fd2af0b9d431bd51e6379fa778633b64acbc926101f225d4ae4eee4
-EBUILD jsoncpp-1.9.4.ebuild 1027 BLAKE2B f0c137cced15dd26a0c379d6578ffbd7cebbb1743381cf1d15ff9ada9c88555d58fa330785f8b0a681114ed59dd1a7be4acd785ec4cee3df20b5ff4af0324642 SHA512 7af331b12975097c826d5d954cfb8693228a1adac9807523eb9df58d3bdef461e7c9f8d7f6588e0f2cccb02e3b577ce6461dfb494c00e9ead2f9bc48d4a11e19
+EBUILD jsoncpp-1.9.4.ebuild 1038 BLAKE2B 75ef1d9b4467f58b4da77531ca456eb0a4f8de7b3fbc97aaed207187cb334f7d9f713fb1ee628a718639c4a97aca8770c06f447561f6d6330c65e3f02d86995a SHA512 39642f1a45f5e165d95372a41ded7bc53db4099c43fd60a6ce2caa6803fac2abe7598e89f4b9f6ef74795c0645f114b1e38ad07122d5235e59f2d0018672462a
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
index e06032f66c70..eec6b6bd9683 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/24"
-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 ~x64-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index ba59e048e60e..74603171475d 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -11,7 +11,7 @@ EBUILD leatherman-1.11.0.ebuild 1147 BLAKE2B c267b48f61cc2aa9f9c20ba4359c6bfe324
 EBUILD leatherman-1.12.0-r1.ebuild 1493 BLAKE2B df12a29ba362646dba648b0208a8d96cb2b7f5766626a32020618fdac4bb903457ab7ab12c5f23ffdfe8cbc2599eee8a29914559f1015a2fcb41ac707e465370 SHA512 60bb18f8c4b580d64e49eb594fa321e06b3167b8bea9edc4d019e639964ff02fe7ab2329518b0c0ef26cfa5e93db1f994ea1da4ccde62cd947e86eb0780e605b
 EBUILD leatherman-1.12.1-r2.ebuild 1327 BLAKE2B 005078e2c9134eb470c2bd653ccd34b7131427d0d86b95bae5117df553b19888f218083c48ab7f4a9892e54dcffa3e7a67030b2b449cb9a297041bfe39b938b4 SHA512 35e7561d08c736cdfea0990183888094521541df8c18a88e937fa6f9dbb23ef56cad91ce042e2b0fc83a9e0e98516abcb5f9affa539095559947a461fc42bc72
 EBUILD leatherman-1.12.1.ebuild 1493 BLAKE2B df12a29ba362646dba648b0208a8d96cb2b7f5766626a32020618fdac4bb903457ab7ab12c5f23ffdfe8cbc2599eee8a29914559f1015a2fcb41ac707e465370 SHA512 60bb18f8c4b580d64e49eb594fa321e06b3167b8bea9edc4d019e639964ff02fe7ab2329518b0c0ef26cfa5e93db1f994ea1da4ccde62cd947e86eb0780e605b
-EBUILD leatherman-1.12.2.ebuild 1334 BLAKE2B 40cf1da626e9e0b83b91c76d432fa7793456406335f8029cafc96010a396d2e880b40dd6515daa7ab5e74955562d517415907fd8764c2daccf7b5f3d8a89053f SHA512 d99e688e02e91b83edffd89b08f722ea43b1b927545f24a994e380450f257a555c35587a0d8834fbcaa8941e9c826283a4877d61d8767c203fe66a5d589253c4
+EBUILD leatherman-1.12.2.ebuild 1329 BLAKE2B b182be7c996de4512b7b0861ef56e9465fc797890b483b9d168d2cf3fb2059ad7de01b6bdd94fdff8e63b1cab2fb544f71fed9442d8aa9e43ca1876babee05aa SHA512 438ec777192a6fa0bb1ac13e3312cd463b968f6747f3277b7d157a995a666bcd560772d47dbb4a07057f3cc6d8f848df33bf86ac472044c7d502e102b94aca9a
 EBUILD leatherman-1.12.3.ebuild 1334 BLAKE2B 40cf1da626e9e0b83b91c76d432fa7793456406335f8029cafc96010a396d2e880b40dd6515daa7ab5e74955562d517415907fd8764c2daccf7b5f3d8a89053f SHA512 d99e688e02e91b83edffd89b08f722ea43b1b927545f24a994e380450f257a555c35587a0d8834fbcaa8941e9c826283a4877d61d8767c203fe66a5d589253c4
 EBUILD leatherman-1.3.0.ebuild 1061 BLAKE2B 256d795d7d96de0cbdc2da569049d4a9378c25b440b364d79d3e2144b25b565ca729028a63a21e5f9493effb252daf7f38ce693a90e5b06eaf0aea24206cc829 SHA512 a2cde05565eb7eca2410f556d87f999e098f8e17ad51686d0225be193da2e3a367137630461564c51fb1cc0b8b429f912a0defbeec823e89e842187737c14b87
 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1
diff --git a/dev-libs/leatherman/leatherman-1.12.2.ebuild b/dev-libs/leatherman/leatherman-1.12.2.ebuild
index 75314013d9e0..4161088fd099 100644
--- a/dev-libs/leatherman/leatherman-1.12.2.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 #RESTRICT="!test? ( test )"
 RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index fb0ec00c0b55..0e824cbe19ad 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -2,5 +2,5 @@ AUX libev-4.25-pc.patch 1237 BLAKE2B 6f07e9a8614f136dc44c099a49aafc57e78d107820f
 DIST libev-4.31.tar.gz 565540 BLAKE2B 59df831f4cfc9a615234d8d5b845a687ea41cc27aea84698e213bfacb79d8f9862ff776c2bf3888495cc303daf3b9073a1f660eaedb1437ebaa6d678c8ef0873 SHA512 c2687c2e538c724ec8d02ce5bf6875d2e697c57623c4d5c4e6a09c5c480dd7ea38bb7af290f120ff9e61f0ecfc9b6a07a653a9f44ea8ecf2487438756105bd18
 DIST libev-4.33.tar.gz 569527 BLAKE2B 8a6cae25ffde10b24a5bbf084f6a8559af326b37acdbdf47dda34b7f0c7955f3ebd26958594444a574cfa3e2b4011e4be93ad2bd994ffd4c094bf36620e67ba5 SHA512 c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b
 EBUILD libev-4.31.ebuild 1126 BLAKE2B 788de40000071e63400ad9c993d6e478efa9080561c9c9a4eef293cf1f44baff7445627b13b87f34f3dd71dc0d1ae5c614604f35afd5f87c38d117404f7df9b1 SHA512 f9806dcb3be49f806e98f506a6ff94c7ccfbbd81f7409bf1ffa73f25ca53daf6ac5986ba0fbcc071156b35d2e13fe2c6c935b8579c04683786c04fde7430a2ca
-EBUILD libev-4.33.ebuild 1031 BLAKE2B cd934e0779425781d08555b318c310ca7141ff7e41c00473b5625ba663bd72cd920db426cde0d502927ce4c4184338c26a8da199b8c747581d2deab288952e6c SHA512 1337eb0597bfc4edd4e3b7a2b7ef19ee90fce2854410bda94ca0e518e04b319c8b939870c0038ace71397f031ba58503b4ee80b308b23f127033964da1142f57
+EBUILD libev-4.33.ebuild 1042 BLAKE2B c8ee09ee545828941593a64ca9002cf4539c49b7dec6e616740149797575fdf7a6c029c278abf06a6732c0addda281b0d496be777ee2248fa113714591161eed SHA512 d794746a0440f8d7719ec9c8efbdfddc40d62b38309a4a5fb022d324a2aa895560e367f495aaaebc0183ded5e2d92c418c67f49c1abc85428ba754df023437de
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/libev-4.33.ebuild b/dev-libs/libev/libev-4.33.ebuild
index 1191b2b546f3..6385b9f3b684 100644
--- a/dev-libs/libev/libev-4.33.ebuild
+++ b/dev-libs/libev/libev-4.33.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
 
 LICENSE="|| ( BSD 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 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DOCS=( Changes README )
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index d5391aefb65c..b93d81ad2314 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,7 @@
 DIST libinput-1.16.1.tar.xz 595548 BLAKE2B 497089248c2104ff7784b7d46d8e846047e054f01c6ea192f1c41171b39213fa1f19be8c8253c32f988bfc6f025d2519697256ffaf62884182c511bcd5c5d335 SHA512 86b2d563c2cff2b3d3cae3acdd399030cc785cc9859a06357a99565ef51f95122a8427c8c0883121fb0760613460a29c8cd8c7a7e3ac68115c10330b3b75cbe0
-DIST libinput-1.16.2.tar.xz 595632 BLAKE2B 0010ee7495e35d093d9cff72195433cfd571fb0b6d2bfbfa61b19eb6baa6cf6d00728673408d9d2427c3cb948e146ffd5a0184fe9a7ca3cc9bf8889b64a55115 SHA512 3394faeb0cdb0a543624e150f04a98f3bce8d67438e47455808bde8eec8ea9cdafb86056e5f8d3431352ae33714e490c55edeb51e0af1972c68fca07c1ef1daa
 DIST libinput-1.16.3.tar.xz 594948 BLAKE2B 6fad03dc8ab0280435b89a1049ed019d29e795279273277c9cad4676f484856d2677845ddc1c5102f2430645053a77c1cde48bb32530d4290ade576843a51ded SHA512 cdf87988b24dc0a44b7b6ed3e15e70c7702bf65f1cfe257924967677c7a1f1485011a9e30254ba8962c83885de78f824e7955cedb07322676332d42532ec4a39
+DIST libinput-1.16.4.tar.xz 596028 BLAKE2B ad2160d83bcbdd65383272e0c4b35e35c7b46a6d0c771d7c0188c92b204d57dae73d0820bb93f662f155c1eab19c0195110f5a18a68de890c808925d5c056814 SHA512 a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee
 EBUILD libinput-1.16.1.ebuild 2230 BLAKE2B 74ca4324289826313f0d01cc08308062483e5c4d204f87f30abe91d2eda88b1278fad9b62a4901c1fbf6b749abacb0f5f92e3b7c52708023c6435392244a46fa SHA512 6290bda45e9c91dafe2a38e3d08c5c83e46c88f13ba186184998c41b8d91f884768d5d12d70fc1072763ddce9ba7545e892699cbbc190e16d757ce32c1833c03
-EBUILD libinput-1.16.2.ebuild 2238 BLAKE2B 71fbec69d0bfddb68e3ad455a8b708a777ad56faa3aa35f5db13a9e5f431b33cc85448c564df453cc626546d0a59fc4b2ca3c42ddc7cb54d87d7b1bc3c712abe SHA512 3c9ab25eea207ef579459301470f5d50e168db887878b2bb841a5eee5231b7b78610ad45c80be26822f5b0a64c2b9037021f8aa669bdb03e002b5ab3221b89df
-EBUILD libinput-1.16.3.ebuild 2238 BLAKE2B 71fbec69d0bfddb68e3ad455a8b708a777ad56faa3aa35f5db13a9e5f431b33cc85448c564df453cc626546d0a59fc4b2ca3c42ddc7cb54d87d7b1bc3c712abe SHA512 3c9ab25eea207ef579459301470f5d50e168db887878b2bb841a5eee5231b7b78610ad45c80be26822f5b0a64c2b9037021f8aa669bdb03e002b5ab3221b89df
+EBUILD libinput-1.16.3.ebuild 2235 BLAKE2B 8d3f923f1a8e607620b6448f383d1f1c6250be8a86e7676cc5979144b1925597fa5b0a29eaa9ba004804304850fbac83f951bf0cbd2ccc9b10018d4cad65cc72 SHA512 f60db4a8fd2479ded03de313aefb9191451155627f0c44dd3d4b7f329a85915a6c329cf2f37f23fa28a450501b7ecbe60c3ae43df7072f74cfeba9d7e45d82b0
+EBUILD libinput-1.16.4.ebuild 2238 BLAKE2B 71fbec69d0bfddb68e3ad455a8b708a777ad56faa3aa35f5db13a9e5f431b33cc85448c564df453cc626546d0a59fc4b2ca3c42ddc7cb54d87d7b1bc3c712abe SHA512 3c9ab25eea207ef579459301470f5d50e168db887878b2bb841a5eee5231b7b78610ad45c80be26822f5b0a64c2b9037021f8aa669bdb03e002b5ab3221b89df
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.16.3.ebuild b/dev-libs/libinput/libinput-1.16.3.ebuild
index e2ae19212794..3dedb0fd61fc 100644
--- a/dev-libs/libinput/libinput-1.16.3.ebuild
+++ b/dev-libs/libinput/libinput-1.16.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libinput/libinput-1.16.2.ebuild b/dev-libs/libinput/libinput-1.16.4.ebuild
similarity index 100%
rename from dev-libs/libinput/libinput-1.16.2.ebuild
rename to dev-libs/libinput/libinput-1.16.4.ebuild
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild
deleted file mode 100644
index e09c02489414..000000000000
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.1-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="5"
-inherit eutils multilib 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="~amd64 ~x86"
-IUSE=""
-
-DEPEND="=dev-lang/lua-5.1*"
-RDEPEND="${DEPEND}"
-
-src_prepare()
-{
-	sed -i \
-		-e '/^CFLAGS.*=/s/=/ +=/' \
-		-e '/^CFLAGS/s/-O2 -fomit-frame-pointer //' \
-		Makefile || die "sed failed"
-	epatch "${FILESDIR}/${PN}-ldflags.patch"
-}
-
-src_compile()
-{
-	emake CC="$(tc-getCC)"
-}
-
-src_test()
-{
-	make test
-}
-
-src_install()
-{
-	exeinto /usr/$(get_libdir)/lua/5.1
-doexe bit.so
-	dohtml -r doc/*
-}
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r100.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r100.ebuild
new file mode 100644
index 000000000000..c7fc464de59c
--- /dev/null
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r100.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+inherit lua multilib-minimal 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="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "doc/." )
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"CCOPT="
+		"INCLUDES=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}" all
+
+	# Copy module to match the choosen LUA implementation
+	cp "bit.so" "${S}/bit-${ELUA}.so" || die
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_test() {
+	local mytests=(
+		"bitbench.lua"
+		"bittest.lua"
+		"md5test.lua"
+		"nsievebits.lua"
+	)
+
+	for mytest in ${mytests[@]}; do
+		LUA_CPATH="${S}/bit-${ELUA}.so" ${ELUA} ${mytest}
+	done
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && lua_foreach_impl lua_multilib_src_test
+}
+
+lua_multilib_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "${S}/bit-${ELUA}.so" "bit.so" || die
+
+	exeinto $(lua_get_cmod_dir)
+	doexe bit.so
+}
+
+multilib_src_install() {
+	lua_foreach_impl lua_multilib_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild
similarity index 89%
rename from dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
rename to dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild
index e56c2587e41d..67165da21a3c 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/lua-5.1.5-r2:*[${MULTILIB_USEDEP}]"
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
deleted file mode 100644
index 66d3e88a1af1..000000000000
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit 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="amd64 ~arm hppa ~mips x86"
-IUSE=""
-
-RDEPEND="dev-lang/lua"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile()
-{
-	emake CC="$(tc-getCC)" INCLUDES= CCOPT=
-}
-
-src_install()
-{
-	exeinto "$(pkg-config --variable INSTALL_CMOD lua)"
-	doexe bit.so
-
-	dodoc README
-	dohtml -r doc/*
-}
diff --git a/dev-lua/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest
index 135066755046..f5131c9f1ee4 100644
--- a/dev-lua/LuaBitOp/Manifest
+++ b/dev-lua/LuaBitOp/Manifest
@@ -1,7 +1,4 @@
-AUX LuaBitOp-ldflags.patch 376 BLAKE2B f1681d7c9b403a31bc687d93e700ec160cc474064da6cfbc33b4aaccbec3856dfa1b4103d32253a54c6a379676d9f4a79a24225dfe8c602e0614cab1d518e42f SHA512 14b779c738dff2413d3b658c6861de02afd4cf577e7fd95b72af4d58240ed406d9727e1fb47d2ccce4d783fd2aeb576770790c85625935723da15d5c18a486c1
-DIST LuaBitOp-1.0.1.tar.gz 22984 BLAKE2B f4c7517e92cb11e7486c8a18e029374a635fda9c368ce9d160485a32b3ad3e63046c1183924d8a432b07e58607867c0e937d7dade4857842456d15778adccc8c SHA512 de326ba899b70ea01c41b02d26b1a5afd07bdeee5628be7cbeaa438452ac4343cab01494ac3e5e6758365de15c5cb9c211e17f2e4dd1e0e9258979d06018c71e
 DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
-EBUILD LuaBitOp-1.0.1-r1.ebuild 754 BLAKE2B 83c18f6c8acb421813ad3487442d7ef0b773ec2f49f6f3c624ab18083945edbcb9c04841a22bb301585713876384f39d86a56977ea409d5bcd9c9ed9cd0ad25a SHA512 8b697c84786862079205663adcc07b2c259090cfd90424bd833aefada2ae88e19da59d817db6ee1c55f9ca374c9d06d71054a3ad6bdb35e62ba6a4edab9ea473
-EBUILD LuaBitOp-1.0.2-r1.ebuild 917 BLAKE2B cab5c4db544326ce4cbfa5cb924b086a5c7593b5e28cc3f0c54e08061a3cfc60f5afb07647e53146924591be17434df7df226d29b86631ae378fcd40b8d07576 SHA512 c227476db749b85cd61bf77c9012ed4807ec1ba5221994b12a7fc1534f9e24b7c255067cb4e8bcb85800d01fa4237f6ced15cdea65ab8db4d86fe5505e99184c
-EBUILD LuaBitOp-1.0.2.ebuild 612 BLAKE2B 2c019f29af3ae8fd6048a733c48fc768990943b7d1b923c4c2f616a3bb702c24b20d837edf9c52285e76500c0584eecaa6794ef06cb7a7cdac22e1e788c9784f SHA512 12b76d07cb530a957097c3683d30344b657a85855968116af9be39b0317f41e2165d70b399a5eb0dba6fae2a6347043ac8775ee3bd20798c640176a5cf252078
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+EBUILD LuaBitOp-1.0.2-r100.ebuild 1632 BLAKE2B 87d251a83a80767068595589949dac0945af0e2de1cd1d12863c46432a1bc0cb16d2932af452fac384eb2bf3a694e5b1d52d56c2f1c9217dee5bcf53261103f3 SHA512 6eb82e63b674aed1388371aec66abef11a8561d8a6995b6ce64923bd569560f67063438fd1702ae439ac4ca7879e903e8a0b67ddece8e584cbcb94e665a7588b
+EBUILD LuaBitOp-1.0.2-r2.ebuild 917 BLAKE2B 704b906d79e32b01ec82e5fddeb95cabd2edddc1fcb9069f893a34a088bb198c8b277b42e748bfcf5893f5cf6c8b39662b5548f5c0b01807e7c331dca74a6ed3 SHA512 b1cb3b831bc3a60f5dbb840158100c97b91c0cc9fc0f902f60921852c93296116b3977f1d197fa61aac0f562cc4c76f1290ba711e2ef03dadde8eef2336197fb
+MISC metadata.xml 359 BLAKE2B 79db34737be833f5be7d7cfcfbee74d93b016909b64a8cfeeac382b70f1ef9487630c5dc64dde58d37ae98a16d0ee96f4dbff8667d125f4d0af4a97275a72b78 SHA512 21a61aecfde180a1f2d721eefc332780f6fcabadcecf5d19a00534e65c84e8c538c988239bfc938e4c7c6a60a5915f6f685b882314067521f7c293f37197b96a
diff --git a/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch b/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch
deleted file mode 100644
index 2a690cdb5866..000000000000
--- a/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: LuaBitOp-1.0.1/Makefile
-===================================================================
---- LuaBitOp-1.0.1.orig/Makefile
-+++ LuaBitOp-1.0.1/Makefile
-@@ -14,7 +14,7 @@ LUA= lua
- 
- CC= gcc
- SOCFLAGS= -fPIC
--SOCC= $(CC) -shared $(SOCFLAGS)
-+SOCC= $(CC) -shared $(SOCFLAGS) $(LDFLAGS)
- CFLAGS += -Wall $(SOCFLAGS) $(DEFINES) $(INCLUDES)
- RM= rm -f
- INSTALL= install -p
diff --git a/dev-lua/LuaBitOp/metadata.xml b/dev-lua/LuaBitOp/metadata.xml
index c36c37139fad..8105c04d111a 100644
--- a/dev-lua/LuaBitOp/metadata.xml
+++ b/dev-lua/LuaBitOp/metadata.xml
@@ -5,4 +5,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index b95c5b94502b..7fc07b99ff6b 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/busted/Manifest b/dev-lua/busted/Manifest
index 15007e9177ff..bddf34b58528 100644
--- a/dev-lua/busted/Manifest
+++ b/dev-lua/busted/Manifest
@@ -1,7 +1,8 @@
 DIST busted-2.0.0.tar.gz 55002 BLAKE2B 39a3b7bf156911e25f94020f9e56b3f43b9f02b910a9d1c1f288dbdb83e5d53253d5b40d73df655844ed683cff7959d42c330c0d061db918385df07870e16da3 SHA512 3151694b1fba1acc52e3bcfee0231008b14934e89da5885d7e063c6f023479c42040c42a8c0aa6ff1f8303ad6b2a70f0687c8a218830de7231007ef8748457bf
 DIST busted-2.0_rc11_p0.tar.gz 48368 BLAKE2B 3e4534795a4d6bd816b9879d447b82e144f738f3601856e5c9fc5419a6b8f3cb57a78a9ce6ad90990c1abe9fe0974b809d10a942b5f4930b4120f98d34de0dbe SHA512 f09cd5ad2be05b37254e9d602433639340b020e0670e8a435f1ee1d312eced37e284c2f5a398d7a0403fac0023851b74dbe659373e495c5354f48baed814c4b8
 DIST busted-2.0_rc12_p1.tar.gz 52404 BLAKE2B 51f12aea26d6b0909fdbf8953b316814ff8cd76d39358a26eb785ac7541acddbfde1b19d2e41c9e966a604f8f00b9517181f87264a76a4ac7f9f8d6008c87692 SHA512 0cb1f6a66110514dc3675b2e667cca676e6672e895b57ffba438e89a1e0a7f4f8f941cab54ead905758987be15e9885e1eeb82baabc9d18bf29ea56b832b89b1
+EBUILD busted-2.0.0-r101.ebuild 1298 BLAKE2B f609e4d50f28cdedb8cc7201e20bd335a583f729f4547bf9d43d7aaa4e451148a5e67a17beb556a0535a18ec02fe8a4e502cb9c243e9359544bf3e9b24f0bca6 SHA512 bca19ddadf2ac1d743f2d7b269dd9ca618410e0561fbea3f63df4d82ce7a8bfb4edad37306e5eee3518e9c6a7884d71bdfc1c6b11d5b70028fc734c743269194
 EBUILD busted-2.0.0.ebuild 961 BLAKE2B 36bfd4e16bea39fde179a7da04840a3bd151a95a18041b9c5b83c59547090dded90183e88a546f32bed1c67804a33128231792702a1196445acb9a64ea169ec4 SHA512 3dbe619392c2e60581aafa1811ce7e130f03cbed10fcac6c4c36b5aef0849166d5c8850dbdbeab26f9c2a1bfdbc6cc2da3ac8c60afef39f5858b64d3318cc93a
 EBUILD busted-2.0_rc11_p0.ebuild 1021 BLAKE2B 6be1c981d3259907dcbd7878c11f6eeb9894ebddd9eda8559881c087bec7e4a1f7d8016765920148defac4644bef46f82b107b4136866e1377c7465f184431cb SHA512 47e1e443cbce25838a3647d2aadcdf244219abff50be7a4cac51906a65ee8dbe2b122145de4c84cd18384c5aa1c4b818d308bb733a4af77e16bff9cf15b16ffe
 EBUILD busted-2.0_rc12_p1.ebuild 1037 BLAKE2B 51659b876392952b2a23b9dd99cca97e1b7ef48b0e23760206a0f282a4e4892afe93f743b611732a95096431627c4196119115af8fd3f7c3030b3588744ecbf7 SHA512 af2b746bb71fdd39e34d82c6b056919665ae63abbc1d7fbef35610a2b65e0a9300a905771f15cb1b9a512b14737c1c524a3aba19d3b4ab4d4d29c4758ed59657
-MISC metadata.xml 652 BLAKE2B 97daa2438be52bd6aa462673572d6b1efce6331e9dfbfa5d3b2915619661ec2b359c6687c5aa294d66eb089e152e93c24f1c2f00dd8ad9dc9d13934fe8170883 SHA512 7b07510891c5df25357c17f05de4bcbf1ea54f44f9ce06507de70ae9ddd835bfd20d1cb4bd3787ffb9ffeb88b238bc148b5c5ffad7abb1853ed0517b03a7d122
+MISC metadata.xml 753 BLAKE2B cb7d80aca20864ef7d138d3834011f666775dfee6614f6d233675824c1715ef5f893402532b0d8b928cd7aa1ecb53e3216150c22fbc9d6a21abf3251a10905b4 SHA512 3bae03d1b27087507aa3b8b4b4365a607256c1c0b9cfccde4bd42c946674feb5325715c0dea925aebfd941ab62c6a2b4bc4bd7a5f0c0211f49c4e2fb45ead48c
diff --git a/dev-lua/busted/busted-2.0.0-r101.ebuild b/dev-lua/busted/busted-2.0.0-r101.ebuild
new file mode 100644
index 000000000000..22652c4ffdfc
--- /dev/null
+++ b/dev-lua/busted/busted-2.0.0-r101.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Elegant Lua unit testing"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lua/lua_cliargs-3.0_p2-r100[${LUA_USEDEP}]
+	>=dev-lua/luafilesystem-1.8.0-r100[${LUA_USEDEP}]
+	>=dev-lua/luasystem-0.2.1_p0-r100[${LUA_USEDEP}]
+	>=dev-lua/dkjson-2.5-r100[${LUA_USEDEP}]
+	>=dev-lua/say-1.3_p1-r100[${LUA_USEDEP}]
+	>=dev-lua/luassert-1.8.0-r100[${LUA_USEDEP}]
+	>=dev-lua/lua-term-0.7-r100[${LUA_USEDEP}]
+	>=dev-lua/penlight-1.7.0-r100[${LUA_USEDEP}]
+	>=dev-lua/mediator_lua-1.1.2_p0-r100[${LUA_USEDEP}]
+	${LUA_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		>=dev-lua/busted-2.0.0-r100
+		${RDEPEND}
+	)
+"
+
+lua_src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto $(lua_get_lmod_dir)
+	doins -r busted
+}
+
+src_install() {
+	dobin bin/busted
+
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/busted/metadata.xml b/dev-lua/busted/metadata.xml
index e8e32b1eb332..3c09cac56953 100644
--- a/dev-lua/busted/metadata.xml
+++ b/dev-lua/busted/metadata.xml
@@ -5,7 +5,11 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<longdescription lang="en">
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
 		An elegant, extensible, testing framework.
 		Ships with a large amount of useful asserts,
 		plus the ability to write your own. Output
diff --git a/dev-lua/dkjson/Manifest b/dev-lua/dkjson/Manifest
index cad99008b472..5c89d0835cd7 100644
--- a/dev-lua/dkjson/Manifest
+++ b/dev-lua/dkjson/Manifest
@@ -1,3 +1,4 @@
 DIST dkjson-2.5.tar.gz 15799 BLAKE2B 25cf9aa3d00d87b367096dc793984766d7777c98ec9e97c5bd72961fb0141bb1ae94682f3719d11bde52104a755636de546fe8aece0fbf7147045175ad8bcea9 SHA512 ec9a226c3a94d7561f8f51bb0e6c92a64385b0d8baf83de862cce7e1c302d900bff723be23e4b5b4c3c2accafaf8d75d4b0842e14b2e41390a3f9761d46a38af
+EBUILD dkjson-2.5-r100.ebuild 902 BLAKE2B 9ddb8a911be85a491e9ecc5d429a78660ff456a635c5db1187c15ca8ad54508bc660cecacd8cd3b96b5dc4e48804648207cb0808be3c32db414b09531cd8cba6 SHA512 f5e74c8bdd4b2551893e95fed020346ac03bd3caf19e656309ba55a3dc671fb5bb98a2e5f0a87632053591067f3a1eed7e1dca87e0b1cec4b0d7cd08eb1ea0fb
 EBUILD dkjson-2.5.ebuild 648 BLAKE2B 7fbde9421fab2cdd933a8eda2b095ee832198a350d4fae0dc964d000785f3af1e84f8e9ad4c8c0ee48e8523aac470e1a0b82456e39801f6b8cc42c4c1d9b8112 SHA512 32508645ad71565d249e4579f5121a59cbdd534fb892209336173bafa03e066fe00e254fe3b98a3c960a803f6d3aa956bedbf5caa3231ca9a821361a5ab9fb42
-MISC metadata.xml 620 BLAKE2B 4285a62df1f275147f5b5a40d83bd570d2458b8f8bd4c32957b9a52364b6bde7f471e4fd6ab58ed80bdd648e5c28fea4038ae63ced6ed7dc9636ba11d3c44f8c SHA512 e224d3462b86cd9c66705a3ffdce9861c03f3cee050e851c8f9064c19a6257ef1f5f18c125b7349d495a343fb9696b408523cccd09cd99be6ed599d9cb45238f
+MISC metadata.xml 721 BLAKE2B db84f905a38fcc1a3b8a19a2fd94dcf66858fe34e0f751bffc0163e4011a3457a8064d36d5cf84366f98e63e2f6b1a0fbe49846412318caed9a37c5c1651910e SHA512 01b562a7ecb7f86455a1934d85ebadd6932f69ae22c642517bbbf6abcd5d6ae28596be99ad4909588d9f22831c834b1c638ba33ec4ec24b4fdeabfe71a215eff
diff --git a/dev-lua/dkjson/dkjson-2.5-r100.ebuild b/dev-lua/dkjson/dkjson-2.5-r100.ebuild
new file mode 100644
index 000000000000..6c81b1358241
--- /dev/null
+++ b/dev-lua/dkjson/dkjson-2.5-r100.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="David Kolf's JSON module for Lua"
+HOMEPAGE="http://dkolf.de/src/dkjson-lua.fsl/"
+SRC_URI="http://dkolf.de/src/dkjson-lua.fsl/tarball/${P}.tar.gz?uuid=release_2_5 -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+DOCS=( "readme.txt" )
+
+lua_src_test() {
+	${ELUA} jsontest.lua || die
+	${ELUA} speedtest.lua ${PN} || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto $(lua_get_lmod_dir)
+	doins dkjson.lua
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/dkjson/metadata.xml b/dev-lua/dkjson/metadata.xml
index dda2ed524394..a5b517b10d3a 100644
--- a/dev-lua/dkjson/metadata.xml
+++ b/dev-lua/dkjson/metadata.xml
@@ -5,7 +5,11 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<longdescription lang="en">
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
 		dkjson is a module for encoding and decoding JSON data. It supports
 		UTF-8.
 
diff --git a/dev-lua/ldoc/Manifest b/dev-lua/ldoc/Manifest
index d674a9cce648..033ca44ae979 100644
--- a/dev-lua/ldoc/Manifest
+++ b/dev-lua/ldoc/Manifest
@@ -1,4 +1,6 @@
 AUX ldoc-1.4.6-mkdir.patch 230 BLAKE2B 672617f3a20ff6f74be02db5402288b4900f2d9d52a433ec9085f2fd2ce629609b9803732c50da6da252287efc7280895c2d3ce64ad4a30cf017e893ea2c5638 SHA512 5c047b48c987d107cf810dffc615ce29e5f2192b927fa91260dacbd2daee92c9aac5eeee0bfbccd9972d47d57928c37a867b9c2d453a7c845793cab0ac01385a
+AUX ldoc-1.4.6-slotted_lua.patch 732 BLAKE2B 52bfd5770b47a082d8f4d0706050bc75766af92d120ab1b95c5359e13c85fe9a0131a40b20cbebe318b0eab42c6f7877749248687c3bc8570c81df08c5af8f51 SHA512 5b226521e5c3af4b23e6f0ffd74cd332a214f1d4bfcef14c1fab170149b669045ec1439d6f2a3bfd40ff3699cbdfb3981e9641d6a44a88d2210f83fa2c5a2cba
 DIST ldoc-1.4.6.tar.gz 126080 BLAKE2B c43a79141ce557a54b9aed3c7523b206bec85602d858c72373d650a70e1741b545b2b9bdd462856c7e16af97f6a5eeeeea26375832f678b52d9e9153547076be SHA512 bcaddba4e462a4fb0aa0d8fcff390de3f195fa5cc569d8f05b84ad0fff900f5ac945be7a2eb15cf5ca60cc462f02c874579e4a19e33776178a04104ef9d944af
+EBUILD ldoc-1.4.6-r100.ebuild 805 BLAKE2B 07ed739e790470030de9de95adc29263beedd1447d6e22859d8a6c4c705d6953d78a469204a6c99622bac432177c19e656a9b1fba0201b0b3341d4ccb5770d45 SHA512 1b98caa30dd79bae63662983c7541b74f509a3f257337a71a9cf1a545d048bde695eafb61b9429bffe7768b7c66b564ab0816c22430fe89eb892f5b4c434d2a1
 EBUILD ldoc-1.4.6.ebuild 519 BLAKE2B ec1a59beaba803f512cc892c6856dc5b09c71ab48ebd9c093f8592bf3822e3ee16836db7abc6dac67360171b4d4ee56727c482fe0398621d61b95c7a6e296e13 SHA512 1638c24f53578d1bca5253a32e8f761b4a1cebf2297495568349e5f95b459b680a2896e9c390259a52738f9c81361de69c971a4d2335d871412e35b0c4c02df6
 MISC metadata.xml 247 BLAKE2B b8d9d5b8d0cd042320e566bfe90f610a133b5c5ebd712026f81661caccfb4bffea14e1d1256b363c9ab422404a65bac2ef9b265f7489129d0bca46067022e73e SHA512 4dd0700f6354ffd28980a6782be85efd6d47a505029f6a781d7679ec2bad2bfe86e218a48ae8e197c3db00dc6d5b222d08197d35ddc7271752510b61cb3dc959
diff --git a/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch b/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch
new file mode 100644
index 000000000000..08776c560a09
--- /dev/null
+++ b/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch
@@ -0,0 +1,21 @@
+Do not try to auto-guess Lua directories from the path to the interpreter,
+it does not work with the wrapper set up by lua-single.eclass. Use the
+values of LUA, LUA_BINDIR and LUA_SHAREDIR provided by the ebuild instead.
+
+--- a/makefile
++++ b/makefile
+@@ -1,13 +1,9 @@
+-LUA= $(shell echo `which lua`)
+-LUA_BINDIR= $(shell echo `dirname $(LUA)`)
+-LUA_PREFIX= $(shell echo `dirname $(LUA_BINDIR)`)
+-LUA_SHAREDIR=$(LUA_PREFIX)/share/lua/5.1
+ 
+ ldoc:
+ 
+ install: install_parts
+ 	mkdir -p $(DESTDIR)$(LUA_BINDIR)
+-	echo "lua $(LUA_SHAREDIR)/ldoc.lua \$$*" > $(DESTDIR)$(LUA_BINDIR)/ldoc
++	echo "$(LUA) $(LUA_SHAREDIR)/ldoc.lua \$$*" > $(DESTDIR)$(LUA_BINDIR)/ldoc
+ 	chmod +x $(DESTDIR)$(LUA_BINDIR)/ldoc
+ 
+ install_luajit: install_parts
diff --git a/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
new file mode 100644
index 000000000000..5486df73038a
--- /dev/null
+++ b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single
+
+DESCRIPTION="A LuaDoc-compatible documentation generation system"
+HOMEPAGE="https://stevedonovan.github.io/ldoc/"
+SRC_URI="https://github.com/stevedonovan/LDoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="$(lua_gen_cond_dep '
+	dev-lua/penlight[${LUA_USEDEP}]
+')"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.6-mkdir.patch"
+	"${FILESDIR}/${PN}-1.4.6-slotted_lua.patch"
+)
+
+S="${WORKDIR}/LDoc-${PV}"
+RESTRICT="test"
+
+src_install() {
+	emake DESTDIR="${ED}" LUA_BINDIR="${EPREFIX}/usr/bin" LUA_SHAREDIR="$(lua_get_lmod_dir)" install
+}
diff --git a/dev-lua/lgi/Manifest b/dev-lua/lgi/Manifest
index eade3afaa91d..07fafbcf7649 100644
--- a/dev-lua/lgi/Manifest
+++ b/dev-lua/lgi/Manifest
@@ -1,3 +1,4 @@
 DIST lgi-0.9.2.tar.gz 291463 BLAKE2B d89752e7c56f9a695f97f90680515fd9acab57991121ec3455fcd88aa0b64828f060d9bf222fb1ab14bdfc956ec3ad296af848168532d09694a0cacbb55dac71 SHA512 755a96b78530f42da6d4e2664f8e37cb07a356419e7e6448003c3f841c9d98ad18b851715d9eb203ea7eb27b13ec46223fa8a1c90a99fd12960ce85b0a695335
+EBUILD lgi-0.9.2-r100.ebuild 2551 BLAKE2B 8ac666e9640fe20642da7e0abff1ccd9279e6789db1d70fdedd8fe8941afc785ee60734398aeedee8051154947b1879ba2441cb9c1d34af850487c810c83e1a7 SHA512 fc2ba268ce95582ba7d81c917d3723cf3d097a6d2aa5ca5094b877916746592267a8a52670cb793e3ca3cac366b9e0d89635fe275effaae26dd3292862484a55
 EBUILD lgi-0.9.2.ebuild 1373 BLAKE2B 4bde8c79ed73ec22ce73d2c4fe0f4cafb468e077e84d8f01ab5b02941e938241cd3608971bc936ffa17681fe0de5eb08c0db17a4d09a9c687f51bb05b59f4309 SHA512 d4227622ea9f1b858d38bf1301e12235718468b8fd4e62ecdf4b76840b82845b41d463e0894e5c02eda044fee2365579f1aa0fc26b0ee31c3766d27507792ecd
 MISC metadata.xml 301 BLAKE2B 972432d1e9e34193df27c31d01aa620d72350b1bbcf383894e65aa0fdf207bc5ad4064f289c4feb7cbe7522aefa157b5cf2d25d00df09fd62c1ffa45db9ce377 SHA512 295eba832f4a3e1c9bd1ff7349fadff65a0d887ec4df25fcd7ce975504ddaf7efe5789492bdd54f3c6e077e8612dab3f3b8abba710bbabeb2ead89d60f0370f3
diff --git a/dev-lua/lgi/lgi-0.9.2-r100.ebuild b/dev-lua/lgi/lgi-0.9.2-r100.ebuild
new file mode 100644
index 000000000000..908e5804dfbd
--- /dev/null
+++ b/dev-lua/lgi/lgi-0.9.2-r100.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED="manual"
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua eutils toolchain-funcs flag-o-matic virtualx
+
+DESCRIPTION="Lua bindings using gobject-introspection"
+HOMEPAGE="https://github.com/pavouk/lgi"
+SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+BDEPEND="${LUA_DEPS}"
+RDEPEND="${LUA_DEPS}
+		dev-libs/gobject-introspection
+		dev-libs/glib
+		dev-libs/libffi:0="
+DEPEND="${RDEPEND}
+		test? (
+			x11-libs/cairo[glib]
+			x11-libs/gtk+[introspection]
+			${VIRTUALX_DEPEND}
+		)"
+
+lua_src_prepare() {
+	pushd "${BUILD_DIR}" || die
+	# The Makefile & several source files use the LUA version as part of the
+	# direct filename, dynamically created, and we respect that.
+	_slug=${ELUA}
+	_slug=${_slug/.}
+	_slug=${_slug/-}
+	_slug=${_slug/_}
+
+	# Makefile: CORE = corelgilua51.so (and similar lines)
+	sed -r -i \
+		-e "/^CORE\>/s,lua5.,${_slug},g" \
+		lgi/Makefile \
+		|| die "sed failed"
+
+	# ./lgi/core.lua:local core = require 'lgi.corelgilua51'
+	# ./lgi/core.c:luaopen_lgi_corelgilua51 (lua_State* L)
+	sed -r -i \
+		-e "/lgi.corelgilua5./s,lua5.,${_slug},g" \
+		lgi/core.lua \
+		lgi/core.c \
+		|| die "sed failed"
+
+	# Verify the change as it's important!
+	for f in lgi/core.lua lgi/core.c lgi/Makefile ; do
+		grep -sq "corelgi${_slug}" "${f}" || die "Failed to sed .lua & .c for corelgi${_slug}: ${f}"
+	done
+
+	# Cleanup
+	unset _slug
+	popd
+}
+
+src_prepare() {
+	default
+	lua_copy_sources
+	lua_foreach_impl lua_src_prepare
+}
+
+lgi_emake_wrapper() {
+	emake \
+	CC="$(tc-getCC)" \
+	COPTFLAGS="-Wall -Wextra ${CFLAGS}" \
+	LIBFLAG="-shared ${LDFLAGS}" \
+	LUA_CFLAGS="$(lua_get_CFLAGS)" \
+	LUA="${LUA}" \
+	LUA_VERSION="${ELUA#lua}" \
+	LUA_LIBDIR="$(lua_get_cmod_dir)" \
+	LUA_SHAREDIR="$(lua_get_lmod_dir)" \
+	"$@"
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+	lgi_emake_wrapper all
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}" || die
+	virtx \
+		lgi_emake_wrapper \
+		check
+	popd
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+	lgi_emake_wrapper \
+		DESTDIR="${D}" \
+		install
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+	docompress -x /usr/share/doc/${PF}
+	dodoc README.md
+	dodoc -r docs/*
+	if use examples; then
+		dodoc -r samples
+	fi
+}
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index dc05310b1519..3f84b66f88a0 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -3,5 +3,7 @@ AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341c
 DIST lpeg-1.0.1.tar.gz 71527 BLAKE2B 5f19d308572f2d7a5ff11d7aa33f437ec682994d0a396a322764cf12a4cb659c66ce6ffaf0c76f6a250a7d767b6545478dd3bb760150b9f88be41fac9dafde0d SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
 DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
 EBUILD lpeg-1.0.1.ebuild 1249 BLAKE2B 1759f35c89ed3331c8051f5de6b9085c94c3ecc97ce53f0186f6dea4dd371de8234ffcd014ec014aefffe4e3f438fc4828e8c9302653db5c99e702d3ca66a6cf SHA512 24acb31792144e36961425fd0da8512f30bfe11a39e7601feae18468d49aa1da5b6ca7774c37c9673595589f7c3afc3eb910422c2fa3564f73543c3c521e881c
+EBUILD lpeg-1.0.2-r100.ebuild 1513 BLAKE2B 6ad045db3f02930a8074c9f9a802289fc6375ddfa706d05c41eb8a1aff4a00a3033a3457d57f4aec8fdcc2cb816aa64231c43393be08405f1e1f0c0d24eb6ca3 SHA512 7900056febf9a0227f9b16056e59ff3f3b7ed963059a7029b34e9da111b591dac24c6f3e25c990ee61c96e080dc7847a3e69136e883fe8dab272ee07af703653
+EBUILD lpeg-1.0.2-r101.ebuild 1537 BLAKE2B b75e317be864dccaa694d84d141b8239012786a141269daf2d780f511a00c3c2ddedd1fa5d4417c63aec5f87156a3ec537e1579a68a2e35171cfa73cf7603080 SHA512 c2a13abc6c681af638cb783c2395544629ff7c28cc1cb1d9ceb20d6bbd22f3d556b15eec28e2fb2f073aafd4a8c0cc7227ee3c3e9888eeaffc529445e98c713d
 EBUILD lpeg-1.0.2.ebuild 1248 BLAKE2B b3339c1bf3510be64ea7062d84293a75ca7f9fcdf3fe360ea0de1176ade94001acc171189f3c8a23f3be35e40245df799cccf355cf07461664d98977f98eef7b SHA512 067e95f7df82997c7fa4ba0c69648ce51b28d4aa590cb8017c2888576762e018e8b1527fc03d01b842dd8c60d0062cbbf986d14ae8050781fecddf003cb19fdf
 MISC metadata.xml 257 BLAKE2B fd30d59ebbc18529dbfe65cbec91247e5ad57a53f834d3abc85cbc18af964033e42dda00052b47281a9a85964b190a83c2c8a6eb30f4a9d38894de51d41d9de8 SHA512 06c87d68775d3b524abb426701b16341156bd54f2553b7a0f14a62ca5492c20bf9ff1719084e225ae5fc44c5b518a71258e1138e19551bfcfe828a11dffb12c4
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r100.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r100.ebuild
new file mode 100644
index 000000000000..a6d27c94e39c
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-1.0.2-r100.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
+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"
+IUSE="debug test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "lpeg.html" "lpeg-128.gif" "re.html" )
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.2-makefile.patch" )
+
+src_prepare() {
+	default
+
+	use debug && append-cflags -DLPEG_DEBUG
+}
+
+lua_src_compile() {
+	# Clean project to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		LUADIR="$(lua_get_include_dir)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	# Copy module to match the choosen LUA implementation
+	cp "lpeg.so" "lpeg-${ELUA}.so" || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	LUA_CPATH="${S}/lpeg-${ELUA}.so" ${ELUA} test.lua || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "lpeg-${ELUA}.so" "lpeg.so" || die
+
+	exeinto $(lua_get_cmod_dir)
+	doexe lpeg.so
+
+	insinto $(lua_get_lmod_dir)
+	doins re.lua
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
new file mode 100644
index 000000000000..10a6b94a1b47
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
+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"
+IUSE="test debug doc"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+DOCS=( HISTORY )
+HTML_DOCS=( lpeg.html re.html )
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-makefile.patch )
+
+lua_src_prepare() {
+	if ! test -d "${S}.${ELUA}/" ; then
+		cp -ral "${S}/" "${S}.${ELUA}/" || die
+	fi
+}
+
+src_prepare() {
+	default
+	use debug && append-cflags -DLPEG_DEBUG
+	lua_foreach_impl lua_src_prepare
+}
+
+lua_src_compile() {
+	cd "${S}.${ELUA}/" || die
+	emake CC="$(tc-getCC)" \
+		LUADIR="$(lua_get_include_dir)"
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	cd "${S}.${ELUA}/" || die
+	${ELUA} test.lua || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	cd "${S}.${ELUA}/" || die
+	local instdir
+	instdir="$(lua_get_cmod_dir)"
+	exeinto "${instdir#${EPREFIX}}"
+	doexe lpeg.so
+	instdir="$(lua_get_lmod_dir)"
+	insinto "${instdir#${EPREFIX}}"
+	doins re.lua
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+	cd "${S}" || die
+	use doc && einstalldocs
+}
diff --git a/dev-lua/lua-argparse/Manifest b/dev-lua/lua-argparse/Manifest
index 5d8d8f090ab5..ce56f8be2ff3 100644
--- a/dev-lua/lua-argparse/Manifest
+++ b/dev-lua/lua-argparse/Manifest
@@ -1,3 +1,4 @@
 DIST lua-argparse-0.6.0.tar.gz 36712 BLAKE2B 88882738453a894db68ef93557d870393eaec1fb2bf39b110bd2691678d26be64734d07c7f01f760d9c1d031e530707449ff2ca54a5cdd428cb8da3b1897a7e1 SHA512 7efdfab8ec563a9e7eddc7aff760fd4d3605df2896939af3f2c80e5ed4d4e5ba45a7815057e15446d242351a6fd139d6b8da802fe318d4a4bcd69918fece53d1
-EBUILD lua-argparse-0.6.0-r1.ebuild 1134 BLAKE2B a543609ce07cb64b520839ba4b86523a447e265429a90635c92d0b4c8cdf21389d42832abb8a1aa34e0b1e3d7436f40ea42259a8118c6c83c262828dad61ea4c SHA512 971a7df7732c2a0e01bb3ba3cff8a6240a737e1c2ff4c22ff573d228a66fd023ab21435dabd7402e1e572cb4155292656b8b98f2cad226f48b42334c0131556e
-MISC metadata.xml 751 BLAKE2B f75d9b07c3ed56932062de304c0df556f31d34afb4254705acda96ff7c535fe8c85c0740c4cb704eee552d53a1dde6f5d9810e132ca17df4edd619992f055d6b SHA512 7e797e99ee38995fb576f7270fcf69d736195809a1e55a4f09364ad6a4a2dbd2614aba7c5823e70716e0ef81021d020ee0d56927f9ea85b08163ff9554faccac
+EBUILD lua-argparse-0.6.0-r1.ebuild 1151 BLAKE2B e736ba1b65f550b6b79b2ddddefbda99c20948abc6c007884c571b9d9b545602d82f46bca530d0956529a0cbd6e4db8843bdb884671904de68c0fc0eee904d49 SHA512 b62e4159148f8b4c5d54cad1e4e47c10d2ea8af50036644f9ecbdb5201260f67107f52f3751b1f829bfdc48bc6e24587c34a0915dcaa98a18a4a2c7e4f7179b5
+EBUILD lua-argparse-0.6.0-r100.ebuild 1151 BLAKE2B 17c633aab87e3648592c13c08a1a06af7c69290dca5f9a25f8eb42b9e97ddcc3829ac9d76e3871d9739b549d93d6e9ec1c74be502b5ad8876be8a09a05c89c4f SHA512 4aaf9e1a881410da490e5087e63a97d44f3aeb5f01403e7fbd93115b4219c7ee708f63dc9a317b2e240cd787d4329324543e56f9def620f69a381506e07be9fb
+MISC metadata.xml 861 BLAKE2B a185dce4492228d1c0ec03fc8a089d78eb4403e77065f0da15e5630e84a795deae30cf7659f57f2472f27f2e49b019b0cf8fdee12e6f269c386e1f3b37171060 SHA512 ad9a84be1da77dca8025a79c4b4390cbf8597e9eac7e0fbe3cf0a195d143a0e18363f7f5a7e2045adc7f6872d99ba13ff8bc19c12390235d9bcc1933dc8a581e
diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
index 622008feceda..550dc291e33b 100644
--- a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
+++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mpeterv/argparse/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc luajit test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild b/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
new file mode 100644
index 000000000000..ea350b4d10e5
--- /dev/null
+++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Command line argument parser for the Lua Programming Language"
+HOMEPAGE="https://github.com/mpeterv/argparse"
+SRC_URI="https://github.com/mpeterv/${PN/lua-/}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN//lua-/}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		>=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+src_compile() {
+	if use doc; then
+		sphinx-build docsrc html || die
+		rm -rf "${S}"/html/{.doctrees,_sources} || die
+	fi
+}
+
+lua_src_test() {
+	busted  --exclude-tags="unsafe" --lua=${ELUA} || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto "$(lua_get_lmod_dir)"
+	doins src/argparse.lua
+}
+
+src_install() {
+	default
+
+	use doc && local -a HTML_DOCS=( "html/." )
+	einstalldocs
+
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/lua-argparse/metadata.xml b/dev-lua/lua-argparse/metadata.xml
index 3af620136775..5ec193fa4b31 100644
--- a/dev-lua/lua-argparse/metadata.xml
+++ b/dev-lua/lua-argparse/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gmail.com</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest
index ec9265721fcd..8251b8cf628b 100644
--- a/dev-lua/lua-term/Manifest
+++ b/dev-lua/lua-term/Manifest
@@ -1,5 +1,6 @@
 DIST lua-term-0.3.tar.gz 3752 BLAKE2B 6d42129b60278a4bf756195bae28529a9a22688945ecf6c5648ea490645de363799e4fe5a188069e3739557c3b45ee83e28e315cdd69e987f022f28e3a673cb2 SHA512 e91585994c0337d4dbdc36f51cec9f66fe7319212e82c56752ed724bbbe273e4dc67977bd13e7963545bb075f23f69a448dfc4cc4d6c3c49e96af99cd3eb59e7
 DIST lua-term-0.7.tar.gz 4365 BLAKE2B 8f4080d4cd3b620cb1f261d417744f112d42b776ab3f4cdb0e52d04b6d64fc4a1ddbd634570496c3bc12e6b10efe5af8025d1f124198ebb3946414679a65f7f4 SHA512 2046ba1861ff590c191bb651941c45eb8b6e9a1252b05e78daaeb31837ce1fc7da9ba124aec34dc7842fd304e945754c463ffd75941125ff952e911ba66efa31
 EBUILD lua-term-0.3.ebuild 1046 BLAKE2B 77c1acb0eaf7cad9e72c6d4e09e52a60078ffe2e8da1d8d119c5083d6fe3b0c493cee7aba008562dc56997ebda0f1713151354ed633dbd7d27389755bfba841f SHA512 060e77c10f7a78844361be521ffdd0996b090bf7a7413b8c85dcf8f4488cd3cec1c1d61991a64c6f3d64e22c092aa5cbac00b465c91f8b2c06a2791daddc7f39
+EBUILD lua-term-0.7-r100.ebuild 1404 BLAKE2B 538ec3a437ae5c8c6e4b5628aaa0b0358b13ad8497a2a2e8ea6a08e603ee6be9fc65830231accca822be3fff12dbea4e246714a12e1d6eafb6969bab67afeb92 SHA512 cd0dff45ac0674a9173ffab7feb2572dfe17075712de1ef70d6d93abd3c1a436514dca3c9f1906122842026e90dd2e67939f11de766b6b73e177e0aebf97f4aa
 EBUILD lua-term-0.7.ebuild 1025 BLAKE2B 6f944135685b719759ea38c09f5edab3b0af7971e344cefec7eaee5cbb0f987a8281a9059e2e2f3938b869e23c54b658ebfe284acac163b4d6c7950c0e685500 SHA512 f32f339a978dac960affffab32db40df7e4dfc62fe811a2b4730ed777f8a750d4d824aa584be41a4b336f182e94ec5077686b230997e2ad047c45fb0752d3efa
-MISC metadata.xml 329 BLAKE2B 53838f32093f301c09eca7e323feeb35d9ceee5a2a38fe0902bafd8893afed48e8b7f8b4bfebfa183cdcabc63d654b983658ae69c08c640cb97239c5f15ea4b9 SHA512 927fa93e0060fdb183c77425cf3716dde54c4b2a6a4fdbfadf9a8bbeeb186b55ac93589003c8259382d3985075e9ef4239c3a7be359bc704cc6d3febc3c8f89e
+MISC metadata.xml 440 BLAKE2B 7578e30f2b7c2b37df1fd563325189efd987df03c42fdb06cfe334a74a7d596b2ef9bb3b1ed2adb9f6aae8aed072cb89df8898d57cab40db23933a54a0963612 SHA512 101ba9221fad8bed21cc6fa169d8063e58cb303f45177a355859e9d3dded2489e22082bfd3104763a5f92fc3d0325b344d4758b5afef7d50d22684fae752de43
diff --git a/dev-lua/lua-term/lua-term-0.7-r100.ebuild b/dev-lua/lua-term/lua-term-0.7-r100.ebuild
new file mode 100644
index 000000000000..5ced1bbb4f1a
--- /dev/null
+++ b/dev-lua/lua-term/lua-term-0.7-r100.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+MY_PV="0.07"
+MY_PV_SO="1.0.1"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Terminal operations for Lua"
+HOMEPAGE="https://github.com/hoelzro/lua-term"
+SRC_URI="https://github.com/hoelzro/lua-term/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-O3//g' -i Makefile
+}
+
+lua_src_compile() {
+	# Clean project to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"CFLAGS=${CFLAGS} ${LDFLAGS} $(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}" all
+
+	# Copy module to match the choosen LUA implementation
+	cp "core.so.${MY_PV_SO}" "core-${ELUA}.so.${MY_PV_SO}" || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "core-${ELUA}.so.${MY_PV_SO}" "core.so.${MY_PV_SO}" || die
+
+	local myemakeargs=(
+		LUA_LIBDIR="${ED}/$(lua_get_cmod_dir)/term"
+		LUA_SHARE="${ED}/$(lua_get_lmod_dir)/term"
+	)
+
+	emake "${myemakeargs[@]}" install
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/lua-term/metadata.xml b/dev-lua/lua-term/metadata.xml
index cd082b51556c..a0fd1bd9d692 100644
--- a/dev-lua/lua-term/metadata.xml
+++ b/dev-lua/lua-term/metadata.xml
@@ -5,6 +5,10 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">hoelzro/lua-term</remote-id>
 	</upstream>
diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest
index 174b2134c38e..b90b4e682400 100644
--- a/dev-lua/lua-utf8/Manifest
+++ b/dev-lua/lua-utf8/Manifest
@@ -1,4 +1,4 @@
-AUX lua-utf8.Makefile 1099 BLAKE2B 5a704cb815f41cee6a5d681ec80f9c3ceab97c6711fddcd91581aaa39d033a418bccc0c59e1c41c1d7f5ada1b85615566d3443f2dcf02e57c8dec88c5480fe41 SHA512 f7a2b59c22cd92b7560a24ac469ffdd24641ab9907c26a8c22d944e75f26b3fe2d80298d70138fd6bdfc5da7a87b1a52cb7243106b47f6daebb237a17fdb06f4
-DIST lua-utf8-0.1.1.tar.gz 35475 BLAKE2B 99ffece901878fc966e0314886ca20255834c76b9266b1806acda7afb84d6a358c556b9a88c10497d2874d7902fac5905907ab25fefb4ba38544d46e3bae1471 SHA512 e0a8632b9391c7e7b35e371f4e95899ec58adb4988f1fe5a7101310f7c774c3a3e88073f156cf7799c57f69c0fc53aff4486beb1e7006bfaa96d86e248e38897
-EBUILD lua-utf8-0.1.1.ebuild 1034 BLAKE2B f10339a910b503ba834c10f751b9f41d9a5b3f6ff0dc51eaeffd475bab04bbed9a0e3f1076580a640b257e359ce3cafec91e1b896b44ada7c2fc6655b55ca4af SHA512 067eb57332bed9152f09e1776dfb6e4b4727f2a8b14ad38ea91708a176ccaf84f3fd2d3ecd3a3bd67be27ea90a4eeaf78e46d67e6b108124afce767b59c48212
-MISC metadata.xml 639 BLAKE2B eaf42f0f69767063b2e0c4745bd49529dbe1c8edd62dc22422a1af9363321f610625ad138f6a7a6828ebdfef0ade15577ed062f4de2817d99dfc2864c305ae09 SHA512 785c2139f6715e4b177d1d97f7ec13988f59af95461af9400e6085388cac83fcb99e3eb65cbf47449be9ff60ee4d0662316ea82b5fb761a22b3d8207b27b465f
+DIST lua-utf8-0.1.3.tar.gz 41830 BLAKE2B 72982c7ec8d8837e391fa6bfb689c1e9f4a7746d0cbc058556f06027b4af00c936036f87baf58f45e1169fd3ea7e6d8174629d5a7279205622cf0710971ca29c SHA512 d0abe73fecbfeba36083c135d77962d953ad9e431721a2557669c912a2703e31c46f84f2ee9ee4ac966a5bcc88d4daef930f8d2d8e72106fa61010509c183e29
+EBUILD lua-utf8-0.1.3-r100.ebuild 1483 BLAKE2B b6a26a8189ccd3827be307d6be311fad82860c47c168cf382174933ed479071f359b046080fe4870076d87b7aeab3ab14c908749cc608d0dd17dc721065df19a SHA512 3c5666cc402e5f6fe71de35209d0ada6bb81ae1bd23d1c1bb753cfb76728c64c00fb4b755faed5c26fd52dd67348f3bd0a715f46db8d41a37862229865648e4e
+EBUILD lua-utf8-0.1.3.ebuild 1353 BLAKE2B 8b6186bf7c6ac5fcabebc03be96df1b2905f83b0490af1dac8b7fe178b9f5f908967f609a30e91967a596828990658ab3e5007879bf42267384f0e601526fd1e SHA512 6d656f97f992b3af19eee3873fde0379d8f661b8707fb52ce38bee76f4dd88d9a54dd9e4aff0875bf44c33b74914eacdbd10fed4e66e707f73db302958b055d6
+MISC metadata.xml 750 BLAKE2B 95215f3aed5389197a071e67411702a07102387343c568c02b48ada5b2f3c0f01b99bb895bd4f11e2c558fc7d352da1afece2b46ea6d63edbfa322ccc7c651cd SHA512 cf8fd4d207d9827fb1a7349f89fa0faf0d1ad38989ebc29dabde5dcee73e718183655a1b8c9f0074f16ea7878bd1d4dbf7e53f65f5003946fddf901c9568d4cd
diff --git a/dev-lua/lua-utf8/files/lua-utf8.Makefile b/dev-lua/lua-utf8/files/lua-utf8.Makefile
deleted file mode 100644
index 456c52f4aaa0..000000000000
--- a/dev-lua/lua-utf8/files/lua-utf8.Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# this file builds lua-utf8
-
-MY_USE_LUA?=luajit
-PKG_CONFIG?=pkg-config
-PREFIX?=/usr/local
-DESTDIR?=/
-
-LUA_LIBDIR      := $(shell $(PKG_CONFIG) --variable INSTALL_CMOD $(MY_USE_LUA))
-LUA_INC         := $(shell $(PKG_CONFIG) --variable INSTALL_INC $(MY_USE_LUA))
-LUA_SHARE       := $(shell $(PKG_CONFIG) --variable INSTALL_LMOD $(MY_USE_LUA))
-CWARNS          := -Wall -pedantic
-CFLAGS          += -I$(LUA_INC) -fPIC $(CWARNS)
-LIB_OPTION      := -shared
-LDFLAGS         += $(LIB_OPTION)
-
-SONAME          := lua-utf8.so
-SONAMEV         := $(SONAME).0
-LIBRARY         := $(SONAMEV).1.1
-SRC             := lutf8lib.c
-OBJ             := $(patsubst %.c, %.o, $(SRC))
-
-FILES           := parseucd.lua
-
-all: $(LIBRARY) $(SONAMEV) $(SONAME)
-
-$(SONAMEV):
-	ln -s $(LIBRARY) $@
-
-$(SONAME):
-	ln -s $(SONAMEV) $@
-
-$(LIBRARY): $(OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY) $(OBJ) -lc
-
-install:
-	install -d $(DESTDIR)$(LUA_LIBDIR)
-	install $(SONAME) $(DESTDIR)$(LUA_LIBDIR)
-	install -d $(DESTDIR)$(LUA_SHARE)
-	install --mode=0444 $(FILES) $(DESTDIR)$(LUA_SHARE)
-
-clean:
-	rm -rf $(LIBRARY) $(SONAMEV) $(SONAME) *.o
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
deleted file mode 100644
index d3dffeb9e9fa..000000000000
--- a/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="UTF-8 support for Lua"
-HOMEPAGE="https://github.com/starwing/luautf8"
-SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="luajit test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:2 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN//-/}-${PV}"
-
-src_prepare() {
-	default
-
-	cp -v "${FILESDIR}/${PN}".Makefile "${S}"/Makefile || die
-}
-
-src_compile() {
-	tc-export CC
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}" MY_USE_LUA="$(usex luajit 'luajit' 'lua')" PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}" MY_USE_LUA="$(usex luajit 'luajit' 'lua')" PKG_CONFIG="$(tc-getPKG_CONFIG)" install
-	einstalldocs
-}
-
-src_test() {
-	LUA_CPATH=./?.so $(usex luajit 'luajit' 'lua') test.lua || die
-}
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
new file mode 100644
index 000000000000..48e0614d06d8
--- /dev/null
+++ b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="A UTF-8 support module for Lua and LuaJIT"
+HOMEPAGE="https://github.com/starwing/luautf8"
+SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN//-/}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+lua_src_compile() {
+	local compiler=(
+		"$(tc-getCC)"
+		"${CFLAGS}"
+		"-fPIC"
+		"${LDFLAGS}"
+		"$(lua_get_CFLAGS)"
+		"-c lutf8lib.c"
+		"-o lutf8lib-${ELUA}.o"
+	)
+	einfo "${compiler[@]}"
+	${compiler[@]} || die
+
+	local linker=(
+		"$(tc-getCC)"
+		"-shared"
+		"${LDFLAGS}"
+		"-o lutf8lib-${ELUA}.so"
+		"lutf8lib-${ELUA}.o"
+	)
+	einfo "${linker[@]}"
+	${linker[@]} || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	local mytests=(
+		"test.lua"
+		"test_compat.lua"
+		"test_pm.lua"
+	)
+
+	for mytest in ${mytests[@]}; do
+		LUA_CPATH="${S}/lutf8lib-${ELUA}.so" ${ELUA} ${mytest} || die
+	done
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	exeinto "$(lua_get_cmod_dir)"
+	newexe "lutf8lib-${ELUA}.so" "lua-utf8.so"
+
+	insinto "$(lua_get_lmod_dir)"
+	doins parseucd.lua
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
new file mode 100644
index 000000000000..ef773e7a9086
--- /dev/null
+++ b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A UTF-8 support module for Lua and LuaJIT"
+HOMEPAGE="https://github.com/starwing/luautf8"
+SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN//-/}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	local compiler=(
+		"$(tc-getCC)"
+		"${CFLAGS}"
+		"-fPIC"
+		"${LDFLAGS}"
+		"-I/usr/include"
+		"-c lutf8lib.c"
+		"-o lutf8lib.o"
+	)
+	einfo "${compiler[@]}"
+	${compiler[@]} || die
+
+	local linker=(
+		"$(tc-getCC)"
+		"-shared"
+		"${LDFLAGS}"
+		"-o lutf8lib.so"
+		"lutf8lib.o"
+	)
+	einfo "${linker[@]}"
+	${linker[@]} || die
+}
+
+src_test() {
+	local mytests=(
+		"test.lua"
+		"test_compat.lua"
+		"test_pm.lua"
+	)
+
+	for mytest in ${mytests[@]}; do
+		LUA_CPATH="${S}/lutf8lib.so" $(usex luajit 'luajit' 'lua') ${mytest} || die
+	done
+}
+
+src_install() {
+	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
+	newexe "lutf8lib.so" "lua-utf8.so"
+
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins parseucd.lua
+
+	einstalldocs
+}
diff --git a/dev-lua/lua-utf8/metadata.xml b/dev-lua/lua-utf8/metadata.xml
index efc3ff445600..e9b8d834be80 100644
--- a/dev-lua/lua-utf8/metadata.xml
+++ b/dev-lua/lua-utf8/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest
index f1ffe8524a58..8ed790923bc8 100644
--- a/dev-lua/lua_cliargs/Manifest
+++ b/dev-lua/lua_cliargs/Manifest
@@ -3,5 +3,6 @@ DIST lua_cliargs-3.0_p1.tar.gz 29904 BLAKE2B 4cb3e33c0d1331cb9c6cef9b8db67c12cfd
 DIST lua_cliargs-3.0_p2.tar.gz 30435 BLAKE2B 8edf60870e0d91593064876a225ef7fbe638425da13b458d6356eaa0636482ca904f9355fd15314d4893e6f5346a6faa30fb6078d191a29aa14e26aa5d74a4be SHA512 e7a475f1d41249b0a35f021a6ccca46078f5b689c1927a4dd4cab80b2e4d291babaab35cf7d64fad3ebf68d871fb5177f030c7a2b28d9f55fbeb4dd26021d024
 EBUILD lua_cliargs-2.5_p5.ebuild 876 BLAKE2B ba627334a770918356cd474f97b7b8f39bad574cd26ecc7de552db033920797a709d78285dbb7940c4800a690133a06d239b618c9635ecde5c2e2367b65c651c SHA512 00571f5fc51ba97a5affd68efa419c47e8646e9cb0ae1d99f085b0a0032dcfcf42b58e4405b7143a7f4bf114b136013ad5e8e5a7986537439a3517a2fc3b98a0
 EBUILD lua_cliargs-3.0_p1.ebuild 906 BLAKE2B 8e1c46a73b29fd61fb06a5fa8fcb202d91df30748e6ab0fa24b2e3befb930c051c451aecaff0847f4156c68b82dc26a87c55dc61a25d91eedf84fb3e3dd451ec SHA512 24b3b938bf998a0c12a48854356d6854c40ce06c73f9dad9c276f1cc69cbee7cf9612440ec045e8584bfe0b7908dafdf6c49a216ff2febbd6630c3d2bbb684b2
+EBUILD lua_cliargs-3.0_p2-r100.ebuild 785 BLAKE2B 44f5b4d3515c9d84f989a4cb9d85d28118697fad315ea588986fcb71dacd41d61648af38c0fc7a9bb90ca976080ca1dff1ea4637a845918909eb793f90ec11b4 SHA512 c0547e4b6fa033cfee5d481af99850aa90edeb5225dd8213993c8347f2396ff0dbc608f31e00beda69b335ac7ad4508221cb72f6d12cacb3e038bc68ca10d04b
 EBUILD lua_cliargs-3.0_p2.ebuild 908 BLAKE2B 247ec30f2616cc0a5a043d85c1c8bc8f7c3098baa8554d25603130d5f082368b82cf3ed84cf747c3e670a24a8f0894737f39bdb27d81624526994bed9aefece3 SHA512 54c6ec9f7ba5c9921c4d2c9e578110b4a6e1100e77611fce95bd407030d04046f32bf0756d9f316563a9adac796122084ada7280b916b29d65c85fd59eb95ed5
-MISC metadata.xml 561 BLAKE2B a38b859e36bacd5481ca588a97d39f3353aedeae25b219c7b6e24353979c659407088e9ef16b71d642c19e26ff628f314ec0fab72ebd55a7fa42d0f0f32638d4 SHA512 da9b4c1e00524c0cc7963b0339a18f0b2fe254338269b8fc77e790ad26704ef92f450859838d7e0730cceda34ed34548c367659fae27302fba02252636537c59
+MISC metadata.xml 662 BLAKE2B f439daeab6ac235e0f754364c7a54ebb313df50fa96288a4f47f75e259809396c9668b216d2ee0bb930413af44ff181a026247db0be3d6f482e95507c3e5e3cd SHA512 f64fe9598875b158de72f71438193fa3558199f41d5981657481a8dd103d35dcd579cdfd10520e8e30e89a0b030c48ab81d358d5f8e363337d1ac6bedab6357a
diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild
new file mode 100644
index 000000000000..471bebcf2aa6
--- /dev/null
+++ b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+MY_PV="${PV/_p/-}"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="A command-line argument parsing module for Lua"
+HOMEPAGE="https://github.com/amireh/lua_cliargs"
+SRC_URI="https://github.com/amireh/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="examples"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "doc/." )
+
+lua_src_install() {
+	insinto $(lua_get_lmod_dir)
+	doins -r src/.
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	use examples && dodoc -r examples
+	einstalldocs
+}
diff --git a/dev-lua/lua_cliargs/metadata.xml b/dev-lua/lua_cliargs/metadata.xml
index 61ea9ce51390..5574ee57f237 100644
--- a/dev-lua/lua_cliargs/metadata.xml
+++ b/dev-lua/lua_cliargs/metadata.xml
@@ -5,7 +5,11 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<longdescription lang="en">
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
 		This module adds support for accepting CLI
 		arguments easily using multiple notations and argument types.
 
diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index e41482e1b190..ba6887749c15 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -1,5 +1,7 @@
+AUX luacheck-0.23.0-disable-measuring-performance-test.patch 446 BLAKE2B 42c83ec5eb3d073a5e907c6285a6a2a26f1563940435a111d74274dcdff76f7662d8b623c86658fa0a0b568e150cfa059d2100d82b7f65fcd293b361ec6c45bf SHA512 046cc3ad7e74435b3c6df1a5d271e82cd90a3c02c9228c5a632b13378a8b17c3cde21b00fdc84ab350493b64ec36beb10591a32d52b96010481b7d6a08655392
 DIST luacheck-0.20.0.tar.gz 132693 BLAKE2B d485ef841c00241023a9cb9bd0e1f994da3b5e79dad01281e0203e1561f788f8d1e8db97910d3a82ab3daafb3dceef1fe2897beee9f16e71350fdff27eba7fe0 SHA512 08b1a64849b329e6ad71b1d7011fac0833de068641270adaa009e9a17139968ab73add3786a508a8787ce1fcfe1f028a35b5434221e4f1f62bea56833e0e65dd
 DIST luacheck-0.23.0.tar.gz 158201 BLAKE2B c0780143a335b1deb7725819dbdac03446742fd459eed5a6de0cf3de5576f3be5379ff7086348b8880eba70dd5f7a1e719e9a09fdcc70abc293e1636f575ad57 SHA512 d76e4b22f1e9d868a8531ad51fb98607e5bfb1fbbd55053105d9978ba6c0455de99202c53d4e199733ea997863b26527fb84e7e9717209fd588f1d02db9db028
-EBUILD luacheck-0.20.0.ebuild 1054 BLAKE2B 3e5aa98c7f3953c831904625dcbcaa24b662620b57a04f85d03c189330f44e305c33b578320aecefd1cd4fdd1aa70fbb839a8f7fbcb563bec6e4be77cb02adff SHA512 3e5c5bb402eb22c464c1d080f23dac3952bd5fbbcb7a21747badf01fb274295059c39ea33f560636be0100dca2fb55cfbdeff8d04703df9eb52c3264ba003834
-EBUILD luacheck-0.23.0.ebuild 1159 BLAKE2B 5e2f247d700f03f376f9cb6d8ed5143b35a084439c5e7ce5a7709476a4c5d27c79b2eec9b77018f2be99cb6fb113dfa3932470e29d87edd21809f4da516c7513 SHA512 11a5bc70bbcab18b03b6e4ea0060cfc8af8836d2cfefadcd851c145e81d4e30bf4a4928d04ca37c57ec3dde7f0b72f9b757506b2e2f74bd78479b6da6a827699
-MISC metadata.xml 718 BLAKE2B 6fa684f1c29b7ce764e08e6643404e461bb2def6a4e08bca778f81798147de4d1c924038d8a824276623aff9a34a5cd17c7296ccb2d3a57b5d1fe2cc1252bbb9 SHA512 2fe325b68e5bbf2977f1d6dc956080815b7cfcc54105f4138780394592f93c0b490ad21dce68cddbbb7678a62e8a79fda9795e1652e4ee72acdfd5a6650efe46
+EBUILD luacheck-0.20.0-r1.ebuild 1057 BLAKE2B 1505be0b11667f9f6799fd1ce6429d79c0086370dcdea86edf2dcfa4608fb6b482489dae8eee12f9446cb9b7bd3f87ea782c73e3b81bca45264620e2386f340a SHA512 970f2604a98b7799dbef9eebab8519bf3d3c331a8c4e734ec7bf419dd847c6eb04d490e05360bef9e8d595a77cd2fa8f0a23c8befc940f2af3c6ab19fab87ecf
+EBUILD luacheck-0.23.0-r1.ebuild 1246 BLAKE2B 1de67350db575c98fc34e686121d7b1d67eedec6b1f129d5cad9f8c5fcd0d28214b807cc000f7424e0ea875e5f9f02f815332c08f7129074a5f158be64bc079f SHA512 1d2f9fa6244a1ebb15bef3b4e80ffece79fdb753a51b0e8051e8970ff5a3bb3311d28e834fb86880be474c23ed535cbead5bfd21d20e4bacb82ba7d0e9f6857d
+EBUILD luacheck-0.23.0-r100.ebuild 1272 BLAKE2B bcfe7ad4b3eec6b49995ba3c62bed1c38bbbe562345f55ba58cf1b2220524368c9bf97de9c9acefbe626134b1e34cbd433c2ba16029abafd9884ddba2f1dee9b SHA512 9f928459539d547f57bb043b334a7c40162680088023c204303b7d369544a1881d544076a4d803c5ed0c75e8b8630952f4668199d9f4ba0515c3949650d56929
+MISC metadata.xml 829 BLAKE2B 76e2e67f3ea5dc70f37a6f3e54a6afc12de689026de589b9d644766c443b62cd66068db5c56d3e63312920adb1d2ecb74a1b2515c4f36790dda650a499a81589 SHA512 c27495f97fda460389d0cc74fa97839ea0837f62997ca3e1b5ae4b70bb7d78f15d81012fc151c1c11ec00079e2ebc1121c61bdd86cbaf137e7eeccf5207e63f6
diff --git a/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch b/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch
new file mode 100644
index 000000000000..04d40ec958b6
--- /dev/null
+++ b/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch
@@ -0,0 +1,13 @@
+--- a/spec/cli_spec.lua
++++ b/spec/cli_spec.lua
+@@ -68,10 +68,6 @@
+       assert.equal(0, get_exitcode "spec/samples/good_code.lua --no-config")
+    end)
+ 
+-   it("allows measuring performance", function()
+-      assert.equal(0, get_exitcode "spec/samples/good_code.lua --no-config --profile")
+-   end)
+-
+    it("removes ./ in the beginnings of file names", function()
+       assert.equal([[
+ Checking spec/samples/good_code.lua               OK
diff --git a/dev-lua/luacheck/luacheck-0.20.0.ebuild b/dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
similarity index 93%
rename from dev-lua/luacheck/luacheck-0.20.0.ebuild
rename to dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
index 070046152a0c..01238064b628 100644
--- a/dev-lua/luacheck/luacheck-0.20.0.ebuild
+++ b/dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="doc luajit test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-lua/luafilesystem[luajit=]
+	dev-lua/luafilesystem[luajit(-)=]
 	!luajit? ( >=dev-lang/lua-5.1:= )
 	luajit? ( dev-lang/luajit:2 )"
 DEPEND="${RDEPEND}
diff --git a/dev-lua/luacheck/luacheck-0.23.0.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
similarity index 88%
rename from dev-lua/luacheck/luacheck-0.23.0.ebuild
rename to dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
index bfdbe93ecb29..47d0aed6d004 100644
--- a/dev-lua/luacheck/luacheck-0.23.0.ebuild
+++ b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
@@ -15,9 +15,9 @@ IUSE="doc luajit test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-lua/lua-argparse[luajit=]
+	dev-lua/lua-argparse[luajit(-)=]
 	dev-lua/luafilesystem[luajit(-)=]
-	dev-lua/lua-utf8[luajit=]
+	dev-lua/lua-utf8[luajit(-)=]
 	!luajit? ( >=dev-lang/lua-5.1:= )
 	luajit? ( dev-lang/luajit:2 )"
 BDEPEND="
@@ -29,6 +29,8 @@ BDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-0.23.0-disable-measuring-performance-test.patch" )
+
 src_compile() {
 	if use doc; then
 		sphinx-build docsrc html || die
diff --git a/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
new file mode 100644
index 000000000000..995faeb6e699
--- /dev/null
+++ b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="A tool for linting and static analysis of Lua code"
+HOMEPAGE="https://github.com/mpeterv/luacheck"
+SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lua/lua-argparse-0.6.0-r100[${LUA_USEDEP}]
+	>=dev-lua/lua-utf8-0.1.3-r100[${LUA_USEDEP}]
+	>=dev-lua/luafilesystem-1.8.0-r100[${LUA_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		>=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.23.0-disable-measuring-performance-test.patch" )
+
+src_compile() {
+	if use doc; then
+		sphinx-build docsrc html || die
+	fi
+}
+
+lua_src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto "$(lua_get_lmod_dir)"
+	doins -r src/luacheck
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	newbin bin/luacheck.lua luacheck
+
+	use doc && local -a HTML_DOCS=( "html/." )
+	einstalldocs
+}
diff --git a/dev-lua/luacheck/metadata.xml b/dev-lua/luacheck/metadata.xml
index dcba9d1f5774..fa1113bb8edc 100644
--- a/dev-lua/luacheck/metadata.xml
+++ b/dev-lua/luacheck/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index d1763d331a89..dc48755cf79c 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,5 +1,5 @@
 AUX luadbi-0.7.2-mysql-8.patch 1920 BLAKE2B 5b8f65c9a6966df0bd18487e09effc073fb4ce9ed7913e1b9397ae722a2fe8cc04bcd8f5dce403fc5181fef8f95bdf71bffd00cb5b99932c6cf48e00daa49175 SHA512 436aa613eb420126f158103bc7c36cb3cc2a680c76d32e6239c2b310b7367bd5275c85640645d904ffee059b970095e8176df23dbca8b54aa13f436a619e2f6f
 DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
-EBUILD luadbi-0.7.2-r100.ebuild 1769 BLAKE2B 6d5c67dde0eb5a59636789f74e3263cc7ff76dd023cb9c926c449b10e3c4ba89e36e569bda3f47e1dbe1a24ce70dc39e2b08b9c8acb0150b9d9ab95d24e6be13 SHA512 bbb89034fd723046ba26256251df95c5828bf1d73d81b32ba684ee6d8b840676203aa5531373d0dc0c5b27c2f402e3074ae5e27ac4a5783603b980ec83d6a8e6
+EBUILD luadbi-0.7.2-r101.ebuild 1797 BLAKE2B 2bd8f4fa6c4af9cff7520eadc714ae84ffa2ed58133f540ca80071724db3d7ee82497a69ccf647969bc014f6e46501a4444d7432ff3a713c51e46d36c5fe5f18 SHA512 d15563be1d3f6dc22ec444a3988ec83aa73200e9a4e38bf767a72664a2dbad9cadf2cd541f3114f09c64207cb31dfbc8a80e6c15f80e5a7f72ba3b27c999e303
 EBUILD luadbi-0.7.2.ebuild 1579 BLAKE2B fa7b1bd1ae6913826966f6687ae8af24f62f3cc4771133ddc17cf72b1b2ff87dfe6a7b0034defe931e7cf5062efcb101609664e6be1a2de04648360141bff7b6 SHA512 923534935b8aa20d437fcf65b62a75853e7c80c00b43f48455ffe9f050cf0fef3e2828afee2b402faa7713c035c484f6dba982357f42a344ba6800cf147e09df
 MISC metadata.xml 328 BLAKE2B c167ea2fe2bc0e9d84453ad1e1d7b703b862d927ea1ed775b68f6928f35d02f0d5b08ba5a910ae666fd826003dea923de1dfc7970d3a349943b6eb7a977cd137 SHA512 bfed24b1441ac6dad0a42125d1e3077e5f78a080bc6a495b9ef3447f423ea248b794650583a96681e7ad42802517309feabd268eb65af63e1c101503b418c030
diff --git a/dev-lua/luadbi/luadbi-0.7.2-r100.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
similarity index 97%
rename from dev-lua/luadbi/luadbi-0.7.2-r100.ebuild
rename to dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
index f7f3c1fdcab6..f19a4a0b67ff 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r100.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	test? (
-		dev-lua/busted
+		>=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
 		dev-lua/luarocks
 	)
 "
diff --git a/dev-lua/luajson/Manifest b/dev-lua/luajson/Manifest
index ed1d332c7ad9..365b94bef76a 100644
--- a/dev-lua/luajson/Manifest
+++ b/dev-lua/luajson/Manifest
@@ -1,3 +1,5 @@
 DIST luajson-1.3.3.tar.gz 42653 BLAKE2B 2bc7310317a1279906681c2de284dc7b9d50766c0c21c606da746d0e709168e5364c3a821798f3ce423dfdd246162212525c1fee7c13cb5f0999db56d1e5e3c3 SHA512 9b507148afaf59871f97e7cf78ad35dc01497d553699d1d1a928543fad6a375aebc3852da86d51d744f10ab2ec24c7b1d7c380852da8134ae05f2f22f6f200c2
+DIST luajson-1.3.4.tar.gz 46941 BLAKE2B 50c8c20c487f92fd19b3e080a87eec58c2cb30d83dfc6acd7aca3f155a04f85a194c069f735a2881e14b0eb3fd3b16e4a75ea625ac81c65b9e25cb1c3601673c SHA512 d24dc8399337b96cde3254a83e5cc1fa995b76f0e1fae54ad91a490f0a6f4c5d0927919320f99d7bc4238ac5529d0ea57435c6be2519fb52e2a83f5005fbc4f7
 EBUILD luajson-1.3.3.ebuild 703 BLAKE2B c70cb25e3cb06d2577abfb8c2ac9494de6a595008e14718f6e690f74ff1c4d87b686a8004546bf329199ff9205d66d77a6ac64878df0e5a13624a65849cfdd09 SHA512 c44bdd39573ba281e6972ccf749385a2172d6353ebbe4784a2ff577ff718c894109aa203d980eb98488719e52b9eeb49c45f79e65ec5cc88562c4bbf1db3c37f
+EBUILD luajson-1.3.4.ebuild 829 BLAKE2B 9ea935a008b6c54953e9c7588de28b93f1fb2f2bdccc36cb5ed005b34ebb58caa6271d722f566ed69e41c104eb1218e893559d13d45b2351e5373391cab8ccb4 SHA512 d5aa6b0af940b30ca1439537f886ee4597e42e12c110cbcc947edc1e78ca41dd3b86039667db1c45b85f4ef99c0609e22e1184b87ef9394600f0e19aa9f52bfe
 MISC metadata.xml 253 BLAKE2B 9a21f2ec285f683bc6766396dc836716c6cb52b0b6829a18144d50010d199b93bd0e47216e958f08e23e7c047b11446f4aa127a8b8ca425ce61b247b0593b6d9 SHA512 0ffb4892273cb493c3afaa3adebb9757669fce7e4135ebbefe066511f4319f1e1b60f306e9a9a2a7ea64bcab53515cd342f8e677c232c1966e02c04599bfb75c
diff --git a/dev-lua/luajson/luajson-1.3.4.ebuild b/dev-lua/luajson/luajson-1.3.4.ebuild
new file mode 100644
index 000000000000..f06cd069d628
--- /dev/null
+++ b/dev-lua/luajson/luajson-1.3.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua
+
+DESCRIPTION="JSON Parser/Constructor for Lua"
+HOMEPAGE="https://www.eharning.us/wiki/luajson/"
+SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="dev-lua/lpeg[${LUA_USEDEP}]"
+
+# Require lunitx, which is not in the tree yet
+RESTRICT="test"
+
+DOCS=( README.md docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt )
+
+# nothing to compile
+src_compile() { :; }
+
+lua_src_install() {
+	emake DESTDIR="${ED}" INSTALL_LMOD="$(lua_get_lmod_dir)" install
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+	einstalldocs
+}
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index af1e0d05d4e3..908f2e8b713d 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,5 +1,5 @@
 DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933
-EBUILD luasec-0.9-r100.ebuild 1685 BLAKE2B 9c11015228dff2c453c9b5433ec96a751142b01a6cf4c00d51d72c2ff5f34d61a0809fbcafc72619976e1c4e396640621ebd4163e5720597aca451db962b9b90 SHA512 184f598125ac692d389a25c46bcd7c36bd039d1b933cf2afa2d957d0177752ddd6fdf1bf12149d0e64893b7787cd332e6b70a81f4b32f86d49d9bb3fc9b3fa33
+EBUILD luasec-0.9-r101.ebuild 1700 BLAKE2B 9c3c0d01798d56ec9ee4d05c11a2bab66c61223b1c67e56041518de84b5b4a7fa5ceba3bc115703d40ec9bac2462514165717b35e4c8455ae6186a859fbe96d4 SHA512 d454a91b591a2c42d4fea20819c5f21afe1f110f2871eb0208787634b825bed613829f07d102039d71e971672bc238aa5c503818ba1d48467a2b57c6d9fc838c
 EBUILD luasec-0.9.ebuild 997 BLAKE2B 5e7ce2c2a4a1168fb844890fc586b6ee5a3d87651910b8d5c70bd3309cd8ae8796b1b77f9ea3a6c42accd4c912048b9de7ed320c2e2147ed000d1aa9a70260af SHA512 ca19f37bc58becf4f8b592f223c5588146cec6821f6c5ca0c9689419ca57795b6fa4b636841bf9f44efaec4aa751230a9f695d9faabb20e1e9acc7f7d25764b2
 EBUILD luasec-9999.ebuild 1103 BLAKE2B 8d32013bb83b774b57beaeebcdd2687c769c34672be5cbf343155954417850592071591b985fd1771fa7633888a2977c0d92326f5e31732ff7ea141b43f55c3d SHA512 c6c9f13f1b8e62b3f1b4ae06374cdfdd6a99fedbcc61fb4bce8911254e9d295fbdd0f7637ef220a0acc2250a7658e29fb91e0182bc50542e49de51b03bc0cc60
 MISC metadata.xml 566 BLAKE2B 2a450b74b0f44833f841b701e215721f4055b44a66e43f649e69a4f1c9757985a09a99f8798e7f219349c190f2614733aad757d81e11f610885dbc0fe08b6e6e SHA512 f02b7d7234f4a6d93cd9c734c1b8a8a09b48fb73998d240925329357a6e9dac590aff6ccde697d18698fdbd6f2c69e4d6f5e983affba91b5a84f4f3108e3d660
diff --git a/dev-lua/luasec/luasec-0.9-r100.ebuild b/dev-lua/luasec/luasec-0.9-r101.ebuild
similarity index 96%
rename from dev-lua/luasec/luasec-0.9-r100.ebuild
rename to dev-lua/luasec/luasec-0.9-r101.ebuild
index d908b664a4c5..ee3f8ffb8613 100644
--- a/dev-lua/luasec/luasec-0.9-r100.ebuild
+++ b/dev-lua/luasec/luasec-0.9-r101.ebuild
@@ -19,7 +19,7 @@ IUSE="libressl"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
-	>=dev-lua/luasocket-3.0_rc1_p20200328-r100
+	>=dev-lua/luasocket-3.0_rc1_p20200328-r100[${LUA_USEDEP}]
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
 	${LUA_DEPS}
diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest
index 3bedeb39f83c..09bf27745ca3 100644
--- a/dev-lua/luassert/Manifest
+++ b/dev-lua/luassert/Manifest
@@ -1,7 +1,9 @@
+AUX luassert-1.8.0-disable-highlightcolor-test.patch 2931 BLAKE2B dcf614b08aa0e89404d18e9bdc77ac5b723d577b8f5694f7fded74275c8ace59e938ddd2ad46b19a9ba7d8a36886d36db384d6fb439a2cccee77cf370e711060 SHA512 0bf9b3877e78183d5db3d33acb977f64e1aa7934f313838ffb5ec9b759283b21f071c619020ca4b8ec8aa36d9ea4e8082e3510d59d800fbd82fef74e0d8b9895
 DIST luassert-1.7.10.tar.gz 35789 BLAKE2B c9aaca445272957a5d67d09700f6dc4c1c6c191d3ea274b97afe874f2f5ea1dfda051bd5674d33b9c040e55aed05f2c7baf01431d762223db57cd05b1c4a68a5 SHA512 2d5ca354b5f7b971f0d3420c305d921143cd7f9e1a6f4559cb466b833886a00a045e7b7c594bd9ec3c929b3d5bb8a7a4a6de75a6599e5cba7614b7652061bf05
 DIST luassert-1.7.9.tar.gz 34803 BLAKE2B bcaacff85ddd1c85b39241dbd2c7eef28f3697318e2a942521dd60eade5dfc9da9f0c69d570f5a9556b49609f1bb79250cec9ba39a98e4a65627d6479f9e2f2a SHA512 4e1257bf7adaa9002af7c6ac15f2d042c9094ceeae9ce065c51296c663a99fa239ac8d37f106151100478cde8c68d3290b42588553ac681d183e7edef288414b
 DIST luassert-1.8.0.tar.gz 38874 BLAKE2B ebc4aab1de5dc830d0b9266726ca6bf361e03000f3a8acd27c04805a6c963373755c8e163b187714f64178acc5d755c05493d745b55c785e3254dd41aa4bef31 SHA512 18b296fececa6b0d5950b2a20c4d30da3bbf9b0932c568bbb8ca212b5c82a1047b73c52ee72b4505a41a393d41dd21321189367e038dd029152d177e11bafc93
 EBUILD luassert-1.7.10.ebuild 874 BLAKE2B 52842a1da1aa2f7403ad84eb8038361e738f0c54ae5c298a01f5aad4924e79da65464a97674d20974efc7150e20d124fe40693fa285b8ffcee6f91d7cbccab36 SHA512 9bfda9a13d9a1e46e5c04a28905a1341ff7782ec4f22a714470a48d03956ea2864e5ca5effc8bab26115e9d05f153f5300d46e004f35883558a923bdb08acdf8
 EBUILD luassert-1.7.9.ebuild 609 BLAKE2B bb29a2069407537bd1e0bb9dc7561951c4615c6405108d11f83fd8132d032e0696f16be288e365a0b4201a41e45dda36e8b360313d58d1b7b0b58628b0c62b59 SHA512 920ca16cdb8eb819218d6eeaf97fcfb18777f68963cc79249622e856b7ef35cc8231e7436c8cb84a673ea50ce20dd95960834be0f19d71c2041e827a3f51bd9d
+EBUILD luassert-1.8.0-r101.ebuild 994 BLAKE2B d0a8cab68455d3acef5aaa3890f482c1e7c6980c89026486a31b5b239b0fbff0624ba7cad1dbf0c3300ce3d1d9426ec3d7378b823f28ac85abf4c6bb63e5545a SHA512 bcb03b7f471d304b9a9bf374f1ab405b85950b5eba27836be0a7d27733fc7b6f8aa24b4cab804a6354f235ca0114da2d01a5aed61992459e6fbf8e625422aeb8
 EBUILD luassert-1.8.0.ebuild 962 BLAKE2B 153ecbd4a7d0b0baf03d0f5a2b1237f3cddc870689128cdae95cc5642c3b1f75b787a1e66c26a4f8019640519568baa5479d65ae7bea8477e68013704358c3d5 SHA512 0dce6316060cc9a2afe25450f4e362b2c5f482bb34fce5d32bb7bc70a56d9ce260c46e22e8f8f8f208f3b9fa51ea38b19077f1e99ea10007f26863392fb590a4
-MISC metadata.xml 497 BLAKE2B 009bcaf2379e9d29771f83aba63ad50ec2e9e02a328e9605a8d2e171e43e59025aab51ba876206d58f86fd7d0e51a28e9d0d1851f0cc4d87c2cce02e11b048a6 SHA512 8bb0c5cc23259fd9e259620ecde2b377220b3d8062b5229777d811b3827a36d770c2518245009be328f932a5fe6f84ecb719d7e9ff604d7cb4524d9a59811f6b
+MISC metadata.xml 598 BLAKE2B 44f0ff617e32241bc72db4da50d83f321cae964924c7dd6c12c46b356158d0ca4a99f228042b2c51e7bdbc0e4573b45cdc15814e5cf73e8a4e4fda450df58ab7 SHA512 d5d5330dba6b543ca5ec99235444ead2c736c2319689513767a27cc654837bb645ab60365e2dd96f9e7ffbd3dbc9c4b3ff5029ad59655bf88bec1f7faa50f80a
diff --git a/dev-lua/luassert/files/luassert-1.8.0-disable-highlightcolor-test.patch b/dev-lua/luassert/files/luassert-1.8.0-disable-highlightcolor-test.patch
new file mode 100644
index 000000000000..fe3f7815a04e
--- /dev/null
+++ b/dev-lua/luassert/files/luassert-1.8.0-disable-highlightcolor-test.patch
@@ -0,0 +1,57 @@
+--- a/spec/formatters_spec.lua
++++ b/spec/formatters_spec.lua
+@@ -102,18 +102,6 @@
+     assert.is.equal(expected, formatted)
+   end)
+ 
+-  it("Checks to see if TableErrorHighlightColor changes error color", function()
+-    local ok, colors = pcall(require, "term.colors")
+-    if not ok then pending("lua term.colors not available") end
+-
+-    assert:set_parameter("TableErrorHighlightColor", "red")
+-    local t = {1,2,3}
+-    local fmtargs = { {crumbs = {2}} }
+-    local formatted = assert:format({t, n = 1, fmtargs = fmtargs})[1]
+-    local expected = string.format("("..tostring(t)..") {\n  [1] = 1\n %s[2] = 2\n  [3] = 3 }", colors.red("*"))
+-    assert.is.equal(expected, formatted)
+-  end)
+-
+   it("Checks to see if self referencing tables can be formatted", function()
+     local t = {1,2}
+     t[3] = t
+--- a/spec/assertions_spec.lua
++++ b/spec/assertions_spec.lua
+@@ -472,17 +472,6 @@
+     assert.no_error_matches(t_ok, ".*")
+   end)
+ 
+-  it("Checks error_matches compares error strings with pattern", function()
+-    assert.error_matches(function() error() end, nil)
+-    assert.no_error_matches(function() end, nil)
+-    assert.does_error_match(function() error(123) end, "^%d+$")
+-    assert.error.matches(function() error("string") end, "^%w+$")
+-    assert.matches.error(function() error("string") end, "str", nil, true)
+-    assert.matches_error(function() error("123string") end, "^[^0-9]+", 4)
+-    assert.has_no_error.match(function() error("123string") end, "123", 4, true)
+-    assert.does_not.match_error(function() error("string") end, "^%w+$", nil, true)
+-  end)
+-
+   it("Checks error_matches does not compare error objects", function()
+     local func = function() end
+     assert.no_error_matches(function() error({ "table" }) end, "table")
+@@ -557,15 +546,6 @@
+     assert.is_same({}, {assert.has_no_match("%d+", "string", nil, true, "message")})
+   end)
+ 
+-  it("Checks assert.has_error returns thrown error on success", function()
+-    assert.is_same({"err message", "err message"}, {assert.has_error(function() error("err message") end, "err message")})
+-    assert.is_same({"err", "err"}, {assert.has_error(function() error(setmetatable({},{__tostring = function() return "err" end})) end, "err")})
+-    assert.is_same({{}, {}}, {assert.has_error(function() error({}) end, {})})
+-    assert.is_same({'0', 0}, {assert.has_error(function() error(0) end, 0)})
+-    assert.is_same({nil, nil}, {assert.has_error(function() error(nil) end, nil)})
+-    assert.is_same({nil, "string"}, {assert.has_no_error(function() end, "string")})
+-  end)
+-
+   it("Checks assert.error_matches returns captures of thrown error on success", function()
+     assert.is_same({"err", "message"}, {assert.error_matches(function() error("err message") end, "(err) (%w+)$")})
+     assert.is_same({"err"}, {assert.error_matches(function() error(setmetatable({},{__tostring = function() return "err" end})) end, "err", nil, true)})
diff --git a/dev-lua/luassert/luassert-1.8.0-r101.ebuild b/dev-lua/luassert/luassert-1.8.0-r101.ebuild
new file mode 100644
index 000000000000..a5902ef63a15
--- /dev/null
+++ b/dev-lua/luassert/luassert-1.8.0-r101.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Assertion library for Lua"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lua/say-1.3_p1-r100[${LUA_USEDEP}]
+	${LUA_DEPS}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		>=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.0-disable-highlightcolor-test.patch" )
+
+lua_src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto $(lua_get_lmod_dir)/luassert
+	doins -r src/.
+
+	einstalldocs
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/luassert/metadata.xml b/dev-lua/luassert/metadata.xml
index 0c230917f9a9..7a9d0e9a4307 100644
--- a/dev-lua/luassert/metadata.xml
+++ b/dev-lua/luassert/metadata.xml
@@ -5,7 +5,11 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<longdescription lang="en">
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
 		Adds a framework that allows registering new assertions
 		without compromising builtin assertion functionality.
 	</longdescription>
diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
index 92c60f4c8f60..a6c24510b3dd 100644
--- a/dev-lua/luasystem/Manifest
+++ b/dev-lua/luasystem/Manifest
@@ -3,5 +3,6 @@ AUX luasystem-0.2.1_p0-fix-makefile.patch 825 BLAKE2B 1732876603d8b5560bda1644de
 DIST luasystem-0.2.0_p0.tar.gz 8058 BLAKE2B fd29eaec7fe2f49e933932a436be75678400fc55a275e412379e05ab5b9cfe2036dfc9e61f960caa29d3c4ab1d439f9ede7ff3cbe14a61287270cc3707660636 SHA512 b8c7ba30470cbf100cc3f14df31729778cfb0aabebe4d27ce42c19581a2585f878d86a29a2f73fd1bef4e5861e2a604d3c396a73f131fa99ae14a17cba52c336
 DIST luasystem-0.2.1_p0.tar.gz 8162 BLAKE2B ad8a6009823ad8202ff3884a3167d0779405c2a6be460b7ef2939622eb4d0fc8edbc6b04aba5dec9dd5e4e38f11ae0dcd582b9c348d5b516aa411858d55c6d71 SHA512 9dc323d4d1914cfa4f278a49ef22e58569d5cd7e369fa17fa6006cd47f9d90c6dfd4404067ea2436aa46a27cfbdf91e4aa26e20b89aeeefdf2aa7252c51fb32b
 EBUILD luasystem-0.2.0_p0.ebuild 1044 BLAKE2B 09dc31b189eec831c6d464eb802eb29b4846a45efe2c30e692e96c9f578ec71b480f82451e407b7fc36bca90065626090a209e75c761d07ef3f77df5d544d6cf SHA512 4c443043cb0b480975288d596d97af29c570e33f44ad7b634c7d86b5660f6e6d14556065ff15c4ed9990091d3a0d916ec3f4affeb32f763b6530258417a2b71f
+EBUILD luasystem-0.2.1_p0-r101.ebuild 1687 BLAKE2B 8a7fca76da37830a8dcd4986837beead2c91d98499e55221d3641e0f8f0be0b9b179c3587162cb8ff3a663c7a489ab858aa961f2424b1f0899dd1ef5bb4a5d9f SHA512 59a6ac5361e8c5c8232b499812a4cda72c54439cae0d050334d8aa5514b73112878dc8ad0210b0f9db8db926148b27b7bbab7cd6a61a2f9d3a17e664e44f3677
 EBUILD luasystem-0.2.1_p0.ebuild 1190 BLAKE2B 3b7990082b8f84302b3a13476600cb3065e9beaea604d4b5c780338b94c08412793d243b42a65207740ea4e82f331f22dbb3bd1eb3a8cca812146ef77f4363f4 SHA512 ef3d0a11177eb5fa2ce12ff74945ee4d7da5ee2e81aaadc5d6db9dc87764403d5f1d4fe26565a6fc231917091e022be0073a199c1cc18c9a62b1444240bb9ecb
-MISC metadata.xml 490 BLAKE2B 59d66fdd8685e01d7b7e928ebb0e43c111062bd7c43ddbbfa070b5af4a5bbc9db1031d0b95f56a05c1b39c35c7aa148e86e6d3761cfc193c5baa6ddffad68639 SHA512 bb9b143436c281ca2664b17b1d1c31ba46befb1139ebd62213dba66003dba43f9d769b65ff8954307faa40690bb31ca7b617628b2feb7c755759b642fc3699ab
+MISC metadata.xml 591 BLAKE2B 9e8a3ce4bfe3031b55f3aa5193c124a8aa3da8907e6dfd97e60c59e4bb846a1aec0f1e2319f43178840a9b9e7517362d654a95c2f0871494482a70a20131e535 SHA512 23828de621a5ac7168e256b201af36343de97edbeb898d6d5e4f882bca88fe345914fc98f70d5e997d8b191dcf446f62250e4309cc2d3f84b9830b023088fa0e
diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0-r101.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0-r101.ebuild
new file mode 100644
index 000000000000..cbc542df1f37
--- /dev/null
+++ b/dev-lua/luasystem/luasystem-0.2.1_p0-r101.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+MY_PV="${PV/_p/-}"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Platform independent system calls for Lua"
+HOMEPAGE="https://github.com/o-lim/luasystem/"
+SRC_URI="https://github.com/o-lim/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		>=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch )
+
+lua_src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LD=$(tc-getCC)"
+		"LUAINC_linux=$(lua_get_include_dir)"
+		"MYCFLAGS=${CFLAGS}"
+		"MYLDFLAGS=${LDFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}" linux
+
+	# Copy module to match the choosen LUA implementation
+	cp "src/core.so" "src/core-${ELUA}.so" || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install () {
+	# Use correct module for the choosen LUA implementation
+	cp "src/core-${ELUA}.so" "src/core.so" || die
+
+	local emakeargs=(
+		"INSTALL_TOP_CDIR=${ED}/$(lua_get_cmod_dir)"
+		"INSTALL_TOP_LDIR=${ED}/$(lua_get_lmod_dir)"
+		"LUA_INC=${ED}/$(lua_get_include_dir)"
+	)
+
+	emake "${emakeargs[@]}" install
+
+	insinto $(lua_get_lmod_dir)/system
+	doins system/init.lua
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luasystem/metadata.xml b/dev-lua/luasystem/metadata.xml
index 009738e31d63..e98cabab81dd 100644
--- a/dev-lua/luasystem/metadata.xml
+++ b/dev-lua/luasystem/metadata.xml
@@ -5,7 +5,11 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<longdescription lang="en">
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
 		luasystem is a platform independent system call library for Lua.
 		Supports Lua >= 5.1 and luajit >= 2.0.0.
 	</longdescription>
diff --git a/dev-lua/mediator_lua/Manifest b/dev-lua/mediator_lua/Manifest
index b7e1b46365b9..85d368dc5a39 100644
--- a/dev-lua/mediator_lua/Manifest
+++ b/dev-lua/mediator_lua/Manifest
@@ -1,3 +1,4 @@
 DIST mediator_lua-1.1.2_p0.tar.gz 5809 BLAKE2B a14cbe043cef72cdff35f92c5e6e420e94ab9930235ef71c31749f6371ef3a9a55c104ebe0a82ad86a95ddb5913ebe69f600e16393b6c5ff532802ace7bd7597 SHA512 116d08a96fa0bd540ac4d3cac61a529a634cba3621c6f2e917b405462bbc0e2ab5b170dc6819e470105cdedf958a382945819eaff4affa63bc057824c163c8a0
+EBUILD mediator_lua-1.1.2_p0-r101.ebuild 941 BLAKE2B f3336be1aa55cfebdc994ef7ea8b84d22dfe6483a0fd6c00afb70fd333ea5840ace05210d10bef2952b77eebfdb40538ae4b97f850beda0f9eb6bf23ccaa61f7 SHA512 11bdc4fdaa4f51b19d3808398aa54dbbd8c7c6027a61be55a5df5056d318f83313bad25ddf9b51b19eeb9860ee46a55045bfddfd171152ae8d058e7e906dfb18
 EBUILD mediator_lua-1.1.2_p0.ebuild 795 BLAKE2B 1c98dc5b6131ddd9565bc01502e4ae1f027f27e0cba6a95436027ded755f1c51308434f44ca0b6ed168c1065f1d84d8e70885dda7e71aa1a308f5f7c1b9dcb43 SHA512 348ea584e11fffab4989e915b1f1e7736436a66126741d6490ee86655c8378182b476a4d49f683302561788850d596bf9b4e31210ae6d8f75cdd150a0dcc1b4a
-MISC metadata.xml 623 BLAKE2B f6e574caf2544132e811d3399dbec685c535e6a9ca63833ecba15d5f3df3faa3f0d585ae5a923aef9455e4d2489a1065e1aad577ee849488b3f982e90beaefd0 SHA512 52bea35c9427c5f7a81b7690447698137215cb1ccfeee60a4733a6a5512f204aef0a258e71701b4565bc2696e491514391c82140507f45ebf72c23a01156b6fb
+MISC metadata.xml 724 BLAKE2B 8dca2534d29b63479b715a665b9f3cb785d7818e9cb467e38b4a69a958826507f286760d43ed6e5645296199ebf94b7562ab5e0c0b8a5e17729637b363e6a8c2 SHA512 a0c40bea247859b28e85de1c00535882a562329973c15899493303b095da0ba1434cf4f01ae68dd027eba3ce9fc46c419b0568187cf3cf851c258aefce6b8220
diff --git a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild
new file mode 100644
index 000000000000..0d1a8c7f594f
--- /dev/null
+++ b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+MY_PV="${PV/_p/-}"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Mediator pattern implementation for pub-sub management "
+HOMEPAGE="http://olivinelabs.com/mediator_lua/"
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		>=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+lua_src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto $(lua_get_lmod_dir)
+	doins src/mediator.lua
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/mediator_lua/metadata.xml b/dev-lua/mediator_lua/metadata.xml
index 29d24e70698d..f38ef1ebf525 100644
--- a/dev-lua/mediator_lua/metadata.xml
+++ b/dev-lua/mediator_lua/metadata.xml
@@ -5,7 +5,11 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<longdescription lang="en">
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
 		mediator_lua allows you to subscribe and publish to a central object so
 		you can decouple function calls in your application. It's as simple as
 		mediator:subscribe("channel", function). Supports namespacing, predicates,
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 89f58f003fe3..40e4caa03e67 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,3 +1,4 @@
 DIST mpack-1.0.4.tar.gz 46382 BLAKE2B 5092830e1a970ad96686ede4d96833a210543418cb23f218ba774bfd724267344f9e44e367490bb33dae8023e1145202ea6e457be7753a426eae990df906547d SHA512 8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c
+EBUILD mpack-1.0.4-r100.ebuild 2189 BLAKE2B 2cbd956200de82989aea1179e07de5106bc3a0bdd4d2c96a77ba1726c923677113ad745297cdb715083bced9e73fae65da324e0c0c43dec5c5e68cc5d3956d5f SHA512 a84fff9a2e4a5f6df78c4fe54cb08ae4c203aad10274a83f300eb8ad8757b467b2118487e3b6c01f0a3e56b33021e3839bac8fc683e4da043d13e8b63947916b
 EBUILD mpack-1.0.4.ebuild 1058 BLAKE2B cc907ec09c79aaf12c09a39f88ad39edbb23b128ae0c0e90d83ecd862072acbb82fd5252f8188540788371d4bf231c64172dcca4a4836cb913cc4cd264cbc966 SHA512 94dff8c1f5154e50653cc58638902f716990175e2d579e4ac5aa866638f252a5b4a3f616037dc183f8592b7785d28b7b9912ded7105fabc4feeeeecb6f858d87
 MISC metadata.xml 249 BLAKE2B 2176c8add15ed2ad2e76def8911e581e40a5a8b0ced984020fa93a507a5478a3636be5b8053df59af367394611b4ab309fe966517286e43ae29963cea9726382 SHA512 1af3a96a7be80a3d2ee34216ac8b85c8965406212b1bd8bef97bb6adb8719f14c97227cfb8885e85ae0981aa93396be9049cf8640640e3669fc17be6c7c489ff
diff --git a/dev-lua/mpack/mpack-1.0.4-r100.ebuild b/dev-lua/mpack/mpack-1.0.4-r100.ebuild
new file mode 100644
index 000000000000..7aca1045a875
--- /dev/null
+++ b/dev-lua/mpack/mpack-1.0.4-r100.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Lua bindings for libmpack"
+HOMEPAGE="https://github.com/libmpack/libmpack/"
+SRC_URI="https://github.com/libmpack/libmpack/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/libmpack-${PV}/binding/lua"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-lua/busted[${LUA_USEDEP}]
+	)"
+
+lua_src_compile() {
+	# Make sure we have got no leftovers from other implementations.
+	# There is no 'clean' target in the makefile, though.
+	rm -f ${PN}.so
+
+	# We set LUA_LIB to an empty string while building version 1.0.4 because
+	# compiled Lua modules must not link against liblua. This has already been
+	# fixed upstream.
+	emake \
+		CC="$(tc-getCC)" \
+		USE_SYSTEM_LUA=yes \
+		LUA_INCLUDE="$(lua_get_CFLAGS)" \
+		LUA_LIB=""
+
+	# Tag the result with current implementation and move it out of the way.
+	mv ${PN}.so ${PN}-${ELUA}.so || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	# "[  FAILED  ] test.lua @ 279: mpack should not leak memory"
+	# It doesn't seem upstream actually support LuaJIT so were this up to me
+	# I would drop it from LUA_COMPAT, unfortunately there are packages in the
+	# tree which currently expect it to be supported.
+	if [[ ${ELUA} == "luajit" ]]; then
+		ewarn "Not running tests under ${ELUA} because they are known to fail"
+		return
+	fi
+
+	# The test suite must be able to find the module under its original name.
+	rm -f ${PN}.so
+	ln -s ${PN}-${ELUA}.so ${PN}.so || die
+	busted --lua="${ELUA}" -o gtest test.lua || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	# This time we move the correct library file back in order not to risk
+	# confusing make with symlinks.
+	mv ${PN}-${ELUA}.so ${PN}.so || die
+
+	emake \
+		DESTDIR="${ED}" \
+		USE_SYSTEM_LUA=yes \
+		LUA_CMOD_INSTALLDIR="$(lua_get_cmod_dir)" \
+		install
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+	einstalldocs
+}
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
index a983b250e6c0..71450e707e91 100644
--- a/dev-lua/penlight/Manifest
+++ b/dev-lua/penlight/Manifest
@@ -1,7 +1,10 @@
 DIST penlight-1.3.2-core.zip 116854 BLAKE2B c653a51cf8ea286c849e1a2c68968ed767c350b1461dd11d9a2e99c81295461c67044175c7bf99c31e8040118e6cfce85f8613d4b6c49e726d31393029abcbbf SHA512 01ba35e967e255f6f39afff9c2238f4921de9e52850ce0d2ec0c9068029fc61a241c82bede680a28fda46c4504582784fcd2241a2eef0bef95c7c389c4042d02
 DIST penlight-1.5.4.tar.gz 213938 BLAKE2B c6bba4fd7fc491d2e6ca464f71b897ba4b5dc8dc94e7340fd77d3add47a9b4a72ce48cea268f94fe55c2aef1edd850f96f00f2ba1ef7186e1e8d86a4e3155366 SHA512 c46e7875410a90390bfbf010a53f1d536475e2094668722618d03951caad0fcb0674c9bc7119a0753e4ed3df9e4d70fef828ba4c6c24e8ada4036948d2432519
 DIST penlight-1.7.0.tar.gz 384917 BLAKE2B 153660f5029509611265399aad8b92d82b266ac470414c06e9d7f01b37225834f98488f30f9bbdfdc3a6714edfe2edc0fccd0356ebb966d964be633bff38eb25 SHA512 edeb09307c9feb5da6bccd82216a6ad71db988c433245d72d28abb6c555004f77eebba556928b0912937b29ef93e065ad491368041e17730610813de8e595d7d
+DIST penlight-1.9.2.tar.gz 396248 BLAKE2B 2bbbece6e9855e8fc54f22f01e516cdf886782ec9a007a4ffac8ac980d7e0836cd19b8a7659ab1e05331e12b11bdb1c9c7df5e2f03c39965532c381298017035 SHA512 8df26e74f73ccf6dc73546640e1537b63e40357072855f9409e96b2ef8251c25b4653456d1237d5142573618af242e885490aa9750dffb387e4670ed9f3cfa91
 EBUILD penlight-1.3.2.ebuild 653 BLAKE2B ff029eaaf0cb3d19c04840e8cf4fe05b6456e8467a2c5452ed2064d5c4ebe7e14418d2f1ec349729ac6733e212f5b8030d27e25c289fad72a03cf5c8c2a6a39f SHA512 14aaea5b639507e25b2ebe5eba54aa10e268cd9147961e03219e389ee11b64c71a65650c719062f617335fb0a42d9defebda748b59da057e5321b29eea744db3
 EBUILD penlight-1.5.4.ebuild 756 BLAKE2B d598d38a6ea20256a2bda11b68a5568d476c4d030132c290ebd3678f3a55c8b5ba4a5b9b20caca1f2e8714c440d59a9aa6567fe2d2dc7fa105764c5de9b4aa13 SHA512 f5c135d7d71145dc50075782afe4a70c148e1094d0b86e7ecf1fbfa26592704dc6503d9f96a8797e8fbd48e4619065965a932c49d40adc3eb1c1939e931fb9fc
 EBUILD penlight-1.7.0.ebuild 756 BLAKE2B 75d8259853ab59bcc367ee62c68a36f573e35ff3c5802266aba61cd2be816eb3f048815f5dbad60a9d71c20f3f345192ccc8d31630a4d4a97e08d07011667076 SHA512 ee214897fd97e590c17e9728bd88d5f2ea4c2a654702a8b0afdb2cb308d50ca467f9b2e5801ae001929ebe5d97b619d6e0e595997d9a480fa58aa542ccb13f33
-MISC metadata.xml 603 BLAKE2B 98847845a10c23006c481f3447fb3439d4c9e1223770455a0eb5d0051d609b48ab51ad274ba4d6ae8249ecc0ed38ff6b33be0b7a7b4ba5dddb6cb6a59df33b23 SHA512 540eed16b3e9223e2ee5181a0ca9cbb794bba41b6f5c5979d9f4796c9382ec24573e05aed2535665b83337e84fbd08b4da1c77ee3bf24f7e1b2bd58e2810f28f
+EBUILD penlight-1.9.2-r101.ebuild 1030 BLAKE2B 9dfd7e643c3afa0e04215591ea12cb88bf50339c386ea28cc0bb2d5809fc6c576d92677feb0fbde59d08e44ff16f0f226cbeda4229efc78ec2a0776ed348c3b0 SHA512 0b96bf98d2f3676697c75378acc2e10d1383b224f898e570f61022dedc042a377d06d2ff9b4cc24d0c5c685a7d6fa073532447ed3d8053e1cb6937db48c0c8ac
+EBUILD penlight-1.9.2.ebuild 874 BLAKE2B b6d246cdd0917018fc7781deae97c1cd1623a4bf09e0bb44aad95efc204ceedba47cad2dcd6005ce591a38c8f99f3c7783a710b0c83bde776ec027dbae661805 SHA512 e3deb5b326019307c26326939030376f040edcaa888ce52581b9350783083ff0c038e1c31af4fd96db9ac9b42b3ad8ea08f3949b745b6e94b8f88b6794ec0b3f
+MISC metadata.xml 704 BLAKE2B 35e8f02d20c248a9b11efdc8b3e1ca81fa1cd8c355a02436f6cdcdeaf07d5a77026cd3053af1255a8fdcc603248f94b871d7432f43766c34766d0fa4f43a1795 SHA512 e64d04284f1bc1f3d2942b72d6077b401f74fb7f717b117c76e16a32f5ae87d7d97982cad6369aba4ebca369b480b6a89952c65cb06a5a7b3a5a6193c23831e3
diff --git a/dev-lua/penlight/metadata.xml b/dev-lua/penlight/metadata.xml
index 2d40d2a40111..98992c8b7940 100644
--- a/dev-lua/penlight/metadata.xml
+++ b/dev-lua/penlight/metadata.xml
@@ -5,7 +5,11 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<longdescription lang="en">
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
 		Penlight is a set of pure Lua libraries for making it easier to work
 		with common tasks like iterating over directories, reading
 		configuration files and the like. Provides functional operations
diff --git a/dev-lua/penlight/penlight-1.9.2-r101.ebuild b/dev-lua/penlight/penlight-1.9.2-r101.ebuild
new file mode 100644
index 000000000000..fc399a4a51d6
--- /dev/null
+++ b/dev-lua/penlight/penlight-1.9.2-r101.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+MY_PN="Penlight"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
+HOMEPAGE="https://github.com/Tieske/Penlight",
+SRC_URI="https://github.com/Tieske/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}"
+
+RDEPEND="
+	>=dev-lua/luafilesystem-1.8.0-r100
+	${DEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${DEPEND} )
+"
+
+HTML_DOCS=( "docs/." )
+
+lua_src_test() {
+	${ELUA} run.lua || die
+}
+
+src_test() {
+	# This is a demo app, not a real test
+	rm tests/test-app.lua
+
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto $(lua_get_lmod_dir)
+	doins -r lua/pl
+
+	einstalldocs
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/penlight/penlight-1.9.2.ebuild b/dev-lua/penlight/penlight-1.9.2.ebuild
new file mode 100644
index 000000000000..a679ab743c3a
--- /dev/null
+++ b/dev-lua/penlight/penlight-1.9.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Penlight"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
+HOMEPAGE="https://github.com/Tieske/Penlight",
+SRC_URI="https://github.com/Tieske/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-lang/lua-5.1:="
+
+RDEPEND="
+	dev-lua/luafilesystem
+	${DEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${DEPEND} )
+"
+
+HTML_DOCS=( "docs/." )
+
+src_test() {
+	# This is a demo app, not a real test
+	rm tests/test-app.lua
+
+	lua run.lua || die
+}
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+	doins -r lua/pl
+
+	einstalldocs
+}
diff --git a/dev-lua/say/Manifest b/dev-lua/say/Manifest
index cdf700638094..4ee1a88245ab 100644
--- a/dev-lua/say/Manifest
+++ b/dev-lua/say/Manifest
@@ -1,4 +1,5 @@
 DIST say-1.3_p1.tar.gz 3667 BLAKE2B bd99687a71129c5038749b0a2ea48411a411cf05559793cc0c4802a5b7aa620fbf4fd15ed9ab661b33c7b9f94468aaf9e292d177aca4d1c7cd29009601d015f0 SHA512 8d4a360bf0731c2a70c23edb9e6e81cab1e7d9b861aa35103a5c6e521633410860d76c46dc2ea62a06ac8ab3b522bc71c11143d6fe7e26e7fa24dd3f5ea1e5f6
 EBUILD say-1.3_p1-r1.ebuild 886 BLAKE2B bdd9cd539a4119a3e521d241f148c9efe3fd8743e9a259f0a0df359735d99eb916dc2f0844dbf24b69f88aa1d81705981ca728c0bf9c2ccb583e838a57e63450 SHA512 50738d259c035e23eb8d90797c1fc2779721b44faaf61695654ad774e54264b20aaccc8d76f94a6c97864009b9fd8692bf4751d0477f1acaed0265276040418d
+EBUILD say-1.3_p1-r101.ebuild 912 BLAKE2B 72b5d6a7a31b70de6d4c4d98b5fd4266147c53c704f8e515675e861d924c83288365b18fa96b6990944add556b7494fd3d0c44992003b53c37a08b0930e009d0 SHA512 81c4c893ca580c13c08e96db392aa6af82c1c018517a72141b7ce98bccb8433120cf23db755b35eb719cee9ffbd58cfb8e636f759231186502f4290a6fb29f5c
 EBUILD say-1.3_p1.ebuild 664 BLAKE2B 23a1ec3ce6ae91d6ee0a79f2b882e49c75b25ac2b6dd45cbbe6c46a44e088f9050120cd21e90b0222e6f7029521a79a3040b4500687fe6aca625cfc0abd287f0 SHA512 348ac3a993aeee0c570dabdf7fc632c8532801620ce384f1b1b8f18b75ee20b6894f0ac1fc0a4d646e6be38df6136f88631f37e26a79275c6f27d8314a486ba8
-MISC metadata.xml 329 BLAKE2B 325677f6bc343be31e86ec9fc075e35d5b4502d56bbca921a051259d3c3f0465ea8b413097b016e1da1071a568379b33f7f68f1415b48f3e7d6da61dd5496580 SHA512 682e04f76b25420d553f0f557f8b236c52882f6789783dcb4ef4df71bfb702dac268bedaba38e3dd1504cc97e403663571bfe07186cf9101cfceb9aaefc8de92
+MISC metadata.xml 440 BLAKE2B 436e12385108634e35113c2cfa87d1fc7702e577f3da3242e575ba2c4d64c076ebd05e96e628db472c59957db600c244a14d72537c3728a83cb3125547c789be SHA512 15db0d85172a05831440854135278061e1240e287e36c367ba98cab7f98505450db8d770dbb7612a21a3468f079328bc074102d067e1c5f5f86e18b8d6794392
diff --git a/dev-lua/say/metadata.xml b/dev-lua/say/metadata.xml
index 91d1cb37065b..dba514960b1e 100644
--- a/dev-lua/say/metadata.xml
+++ b/dev-lua/say/metadata.xml
@@ -5,6 +5,10 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Olivine-Labs/say</remote-id>
 	</upstream>
diff --git a/dev-lua/say/say-1.3_p1-r101.ebuild b/dev-lua/say/say-1.3_p1-r101.ebuild
new file mode 100644
index 000000000000..cef73fc92c85
--- /dev/null
+++ b/dev-lua/say/say-1.3_p1-r101.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+MY_PV="${PV/_p/-}"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Lua String Hashing/Indexing Library"
+HOMEPAGE="http://olivinelabs.com/busted/"
+SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( >=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}] )
+	${RDEPEND}
+"
+
+lua_src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto $(lua_get_lmod_dir)/say
+	doins src/init.lua
+
+	einstalldocs
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 00e253ee4d40..1c0ed8560bb9 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/camlbz2/Manifest b/dev-ml/camlbz2/Manifest
index 4565b00d7c2c..2ba1725137d9 100644
--- a/dev-ml/camlbz2/Manifest
+++ b/dev-ml/camlbz2/Manifest
@@ -1,4 +1,3 @@
 DIST camlbz2-0.6.0.tar.gz 57771 BLAKE2B 5b4337ca547c37f6982c29c9b70f00ca3100983541a80bf16e8d549c2eabf64ef917ea3ba445c8bb5bbcdb1a652cc5cd586c95299d194a7abe8e68ea9f1a0599 SHA512 1052536bb08c9d9f9bdf4a063a5a01389445b55117ce423dd1732de00cd79db5e4befb4ce5c81c5db8a6d40b28a2ac4b897bb00598fdccf76ea92a2966592680
 EBUILD camlbz2-0.6.0-r1.ebuild 672 BLAKE2B f6e9ada40d80104798f1fb8cfa32341924472adaf3d5d0c4f122c43241f217fda1ff2e7bf295dca476454c204f8b4c01af8b0909132b8d29ab65c549d6f1f00b SHA512 d6616b2fb9af683e1942d028c636ecac5bc26ab96f4553527c8a6fec0442b2b562e3a6c2ed9b386a34f315fc3643d3fe6b2c6009e79cd106f9a1c0e9a017ddba
-EBUILD camlbz2-0.6.0.ebuild 645 BLAKE2B f40fb6ee805b2e07807a199db36d9f7148738e14942734039aec433fa347aeb79e1842b66343998b3c8665d7783d2b6d80d425d9fd24f506393791ed67b38aa1 SHA512 ad7b303c71c3c94f91b71849dc74c3ceb3294052d017dd87fc485ad69531774df34565ef37dadf43e57f7eacdc70fd977e2b27e5a98f91223d54dd52c617d2ed
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/camlbz2/camlbz2-0.6.0.ebuild b/dev-ml/camlbz2/camlbz2-0.6.0.ebuild
deleted file mode 100644
index 15884ba324e3..000000000000
--- a/dev-ml/camlbz2/camlbz2-0.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="OCaml bindings for libbz (AKA, bzip2)"
-HOMEPAGE="http://camlbz2.forge.ocamlcore.org/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/72/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="doc"
-
-DEPEND="app-arch/bzip2
-	>=dev-lang/ocaml-3.12:=[ocamlopt]"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake DESTDIR="${OCAMLFIND_DESTDIR}" install
-	dodoc ChangeLog README ROADMAP BUGS
-	use doc && dohtml doc/*
-}
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 8226b584a816..9bce8a0c6a5f 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -1,12 +1,8 @@
 AUX oc409.patch 615 BLAKE2B 6bda1fa9e8424dd31552756f67569fbe37b4b83fa75566cb9675823ee34cc37cd41be1fd6ba53969a736f08f15e8c9073c9c60997342bbb3c65adb71ffa7313a SHA512 de9b3efe72731152d8c6320e8ce4b5d9bb9c44ed1116dcebefb8dc87d725c1d3feaa81f57bed3eda7bac34d7745811ba373bbfc540bf94761d42a216ce09ab58
 AUX reload.patch 595 BLAKE2B 61d89b27f1e192d160160f14a3a58a57ea77e9ac6dd214a8fedb26b2ec554ed5b0b4ea360e04f52110054840821119a2f4dac6db71318c0edbfbeeca64485db6 SHA512 e39221716cda7a38dc6af4b39b68ce3bba023c625535227c40d01a87c52d4756cc46f9c014a8806b468cd9a01e8a65b848f397203950ef03528393121c2c6537
-DIST camlp4-4.04_p1.tar.gz 648320 BLAKE2B d383a366facaaa440b24184bb54a8e1c3bb22ae02387a0bc4f9ee4331ecdc60e5bf22715c1022c987041fb081eb448794a74026736df9f70e05c7213e08bfa44 SHA512 7db8eebcf3d230f60650ba62d9cb630c069394237e97b678a40b61d3dcaded752a2b7e089a50ff528f1ea0740d0291b722df123a072f2cee489cadc5201c6776
-DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854 SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
 DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515 SHA512 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
 DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e SHA512 7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
 DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
-EBUILD camlp4-4.04_p1.ebuild 1024 BLAKE2B 20c33c06a5a541454f0b750fc7c23f32bac0e4af3272432c65cbc3967f1d3aefa4b43be226dd0018f6f338cd18d02266a506ac7ddb4cc0fd07bba48091c555aa SHA512 9d927b94f63edd9a12a51abe35d781c8d1260bef08a8dd91d588875d44eaf3202f8971f69036d530393f089dbc8b7b17c5eae6b176aa7a713c8116af9dec2fb2
-EBUILD camlp4-4.05_p1.ebuild 1029 BLAKE2B 2b3e8b2259584cf0a0e3bce97066e088375cad981ba4e4c352748949d26a4c3dcbb4c04cb6435fde8b3c3c25a5a5d882175676e2feb1fd3e29665ac1335326ca SHA512 d09be322a43d576bedd94133903d3841b2d847eabb5bd32e3680a8988bf9c9da82ad60ddada8589ec1effa7da8ed315251217bd9b47c1214e4344fb05029f0f0
 EBUILD camlp4-4.08_p1.ebuild 1091 BLAKE2B 4c0e75a3906c6778050b313cdfd97e87054ef38564a5ccfb0ef7d1993461cd82bf46b692cd6e7bf75530b38b1475a54026bc73d9ea93cff592d31df28206a3e9 SHA512 5061c2c1498b94ee14c78512ddbc8671d50f19031931dfbae61501c88fc6fb43302806a5da815e4a14249525d277586713093cf23257d8f1260eca237f9fb795
 EBUILD camlp4-4.10_p1.ebuild 1070 BLAKE2B 657cb82026e41f73108b3e17b037c5db39940327bab6a0b3c1ce2e21c995d77ceb6679bdb6fc05ee15a18f1daf6a9f0f4f1f15c46a6b718163628ff14a855ecf SHA512 c559a97688601ad409049f0a1a069a8aec654d37ae065f7f4adeb5e997ac4289bd6170c3209c35ec29451f75110c17c9b57751f13d19459145989b55bfbfcb72
 EBUILD camlp4-4.11_p1.ebuild 1070 BLAKE2B ccd8d0e94a8e4cac98cc1065531d92540e5ac51899cc5a27dabb46e84e40618a083c9b56ee3c2c056bed2a6a679a63fa91d253f8b2a1ed51d18857a05e750bc9 SHA512 9a953260137eaa8d1da68b3b9d9a6ab56536d2fce751cf644c39bf362e94f306adbafcc2afadba0262835e6e08774aca707db31431c3a47b96e9566033da3ad0
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
deleted file mode 100644
index dd82d7f3b238..000000000000
--- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV=${PV/_p/+}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="System for writing extensible parsers for programming languages"
-HOMEPAGE="https://github.com/camlp4/camlp4"
-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"
-IUSE="+ocamlopt"
-
-DEPEND="=dev-lang/ocaml-4.04*:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
-
-S=${WORKDIR}/${P/_p/-}
-
-src_configure() {
-	./configure \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="$(ocamlc -where)" \
-		--pkgdir="$(ocamlc -where)" \
-		|| die
-}
-
-src_compile() {
-	# Increase stack limit to 11GiB to avoid stack overflow error.
-	ulimit -s 11530000
-	emake byte
-	use ocamlopt && emake native
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-META
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
deleted file mode 100644
index d59f89100ed6..000000000000
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV=${PV/_p/+}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="System for writing extensible parsers for programming languages"
-HOMEPAGE="https://github.com/camlp4/camlp4"
-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"
-IUSE="+ocamlopt"
-
-DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
-
-S=${WORKDIR}/${P/_p/-}
-
-src_configure() {
-	./configure \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="$(ocamlc -where)" \
-		--pkgdir="$(ocamlc -where)" \
-		|| die
-}
-
-src_compile() {
-	# Increase stack limit to 11GiB to avoid stack overflow error.
-	ulimit -s 11530000
-	emake byte
-	use ocamlopt && emake native
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-META
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest
index 9f24378062e0..b76dbc54cd6e 100644
--- a/dev-ml/cmdliner/Manifest
+++ b/dev-ml/cmdliner/Manifest
@@ -1,9 +1,3 @@
-DIST cmdliner-1.0.0.tbz 46542 BLAKE2B 7a667e218c298dbe4f5ba8ff034f15596e9b89b1a267fbdf7f6f811e42d61b103b08a2c8b9bd45e83bb249ae5ed078eb646630cd8a174af267354b25dc13ca54 SHA512 3fc87e49504167864ba4d81fde7bbaa01b7d58b06e2b68b36647857590f41fdc8b3bbd547418f8159b0e76628236b5c30301404b3d8d57e2ff3f082228eee73c
-DIST cmdliner-1.0.1.tbz 46614 BLAKE2B 609220b8dbb0aa5ade9f504f420ed7c6ee1ad9aa1f9cd02b1edba60b86791e59a12faca0ebe6ed9cbb5fbeefdfe25b524509bf311f1611022b6c62ae38df01c1 SHA512 b792dab3a7f53f69d74d07acbb013e48235614e29a477b7e9e7d7b58013d47ff842fbaeef50acda305434185325855ef83d839d5acb0ccf460276f0ca880ee7b
-DIST cmdliner-1.0.2.tbz 47350 BLAKE2B 226481c73e66fb45a69b563bef9f95c6a04b782072643fd8e66e4da4907f899a72e2b4e1217b46c3a1f417bf9e4be193c3528da09954808043e4abf47be4d5c2 SHA512 d718d9abe4fe0ea0e7453ed09e57de2a427cc450225cf2b56513d99af4b4218c3fe96ab08dcebd202b9ecf25a471bb7c67511262f35148dfe15684421be6d743
 DIST cmdliner-1.0.4.tbz 49558 BLAKE2B 8ea922a22d08fc4cce6c0aff1adff9a2fcdaee8e13b7bdfad4a08b459e8a6557761fa70c9e34100bc8baaa4113e5729f2daf297fc1f618bd8c30b9323bb87ba2 SHA512 4cd1cc0932b8bbd607160cc9816b35c12a68a358a35ffcb6827f547052dc517e871a91ddbaed0447cb1fa5fdf510cdf5d760e8e5c1e4548f82e1d523e2b3ecb3
-EBUILD cmdliner-1.0.0.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
-EBUILD cmdliner-1.0.1.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
-EBUILD cmdliner-1.0.2.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
 EBUILD cmdliner-1.0.4.ebuild 1071 BLAKE2B c01b7fca5f865e517439b5f14df8614a55b46002b47f6d8b89dd47029ca807bbfea57aa5e02559ee76e168447a50edd65d52110730a57d45af46e544f5e1888d SHA512 9ca92c90e2686d3d3f5fcc1df014f14b40ceedc1107f7e8f1a4f0ab35d8973e52c409fa9f03a6d084c9b03a8f579873eec69bc75a3c64a23aff2a54f0a05da72
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/cmdliner/cmdliner-1.0.0.ebuild b/dev-ml/cmdliner/cmdliner-1.0.0.ebuild
deleted file mode 100644
index 33b960914162..000000000000
--- a/dev-ml/cmdliner/cmdliner-1.0.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=5
-
-inherit findlib
-
-DESCRIPTION="Declarative definition of command line interfaces for OCaml"
-HOMEPAGE="https://erratique.ch/software/cmdliner"
-SRC_URI="https://erratique.ch/software/${PN}/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/topkg
-	dev-ml/ocamlbuild"
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--tests $(usex test true false) \
-		|| die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
-
-src_install() {
-	# Can't use opam-installer here as it is an opam dep...
-	findlib_src_preinst
-	local nativelibs=""
-	use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
-	ocamlfind install cmdliner _build/pkg/META \
-		_build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/cmdliner/cmdliner-1.0.1.ebuild b/dev-ml/cmdliner/cmdliner-1.0.1.ebuild
deleted file mode 100644
index 33b960914162..000000000000
--- a/dev-ml/cmdliner/cmdliner-1.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Declarative definition of command line interfaces for OCaml"
-HOMEPAGE="https://erratique.ch/software/cmdliner"
-SRC_URI="https://erratique.ch/software/${PN}/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/topkg
-	dev-ml/ocamlbuild"
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--tests $(usex test true false) \
-		|| die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
-
-src_install() {
-	# Can't use opam-installer here as it is an opam dep...
-	findlib_src_preinst
-	local nativelibs=""
-	use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
-	ocamlfind install cmdliner _build/pkg/META \
-		_build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/cmdliner/cmdliner-1.0.2.ebuild b/dev-ml/cmdliner/cmdliner-1.0.2.ebuild
deleted file mode 100644
index 33b960914162..000000000000
--- a/dev-ml/cmdliner/cmdliner-1.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Declarative definition of command line interfaces for OCaml"
-HOMEPAGE="https://erratique.ch/software/cmdliner"
-SRC_URI="https://erratique.ch/software/${PN}/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/topkg
-	dev-ml/ocamlbuild"
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--tests $(usex test true false) \
-		|| die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
-
-src_install() {
-	# Can't use opam-installer here as it is an opam dep...
-	findlib_src_preinst
-	local nativelibs=""
-	use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
-	ocamlfind install cmdliner _build/pkg/META \
-		_build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index bdbb39b45504..adc5f61c37f4 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,6 +1,4 @@
 AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
-DIST cudf-0.8.tar.gz 55147 BLAKE2B c091a55e438979f73bfd5fd16f1e793ec984b24becc902e6eed856afea0f39586001174847b8626bbf162c2b51cbb98cdb60d9539c9aac0a1d651b693e686704 SHA512 cea9e51094076089b1beb657f6b2ccc6ac5f49660e06743f8ec646b277beb4c830f90156ae240a6903de55d09caee78fb0dc75efd76ca65fd2b40ab8756301e3
 DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
-EBUILD cudf-0.8-r1.ebuild 1369 BLAKE2B 7745e2dcd6ded40d3bc34847f651086156d4425c4c88bea34fde1a10c9e224655625c10bcc4acdd74a67f1e1ecc67c11e9d78cb9cd9d79ca1c88ca808dcd7d87 SHA512 45c6b14fb173794aae906e2b103cdec0c546b7e07954c0bbfa6180f056ceaf58e0915748aed957e2206dff59b040f38e9461873dc1112202fc314aaf3370d577
 EBUILD cudf-0.9.ebuild 1642 BLAKE2B 0bac926cdaba47d0a1204245191cb84c243ebe001bf4d272905832896739e3228939e2eaa9735b0a5fea049b946c5ab6b1dae77ff51c6ef249fa545de3da2e98 SHA512 8f9c6ddac87ed93c18ad19c08057424e0c004d1283debbdbd67ad57af1c5cce6da62dcba62cfae04fc4fe10bb9de392c9ad096c0108ac7a15094ac454d8dbd87
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/cudf/cudf-0.8-r1.ebuild b/dev-ml/cudf/cudf-0.8-r1.ebuild
deleted file mode 100644
index 682642554816..000000000000
--- a/dev-ml/cudf/cudf-0.8-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib 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/34659/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/extlib:=
-	dev-libs/glib:2
-	dev-ml/camlp4:=
-	dev-ml/cppo:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-	dev-lang/perl
-"
-
-src_prepare() {
-	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 -j1 all
-	emake c-lib
-	if use ocamlopt ; then
-		emake -j1 opt
-		emake c-lib-opt
-	fi
-}
-
-src_test() {
-	emake test
-	emake 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 08e7827b7b85..c5d3ba1faaba 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -2,5 +2,4 @@ AUX ocaml406.patch 1623 BLAKE2B 741d94b936ed59aa3b158cca587ee2aaddb72e06703cbeee
 AUX unix.patch 406 BLAKE2B 270b1e747ab9f270c49ea2ccfee0734600160f1db2f6ee912467989e1c59b31a0840d3a83fa857000b50a5a61d29422629bc9eb2334c7b08db93ef43d12229f7 SHA512 f6d7a3d100c425767ce304c620376cf815b8de59b04aea7ee439e79159cb7aa96cf1903498173d341fcf8d61391edf0b183ab4cda17ce91f41db9aa25ae8aff5
 DIST dose3-5.0.1.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
 EBUILD dose3-5.0.1-r1.ebuild 1678 BLAKE2B 4d9ee4f7be0f91bdbbd92d256202e0a7f4f93ada147e95d4b8df002d0583636d87a81e9d59b060b13b51560786099c42451f6c5a1f31f2766c994878fcd39308 SHA512 ab0fceac967da108330269bb6b8a845e9a6406ffd3aaf83fb2ca16fa5d1bdedf31c05ab1986823e2c9b39ed1ec83409b1c2e369ad556dadb03e85d518e059ba2
-EBUILD dose3-5.0.1.ebuild 1541 BLAKE2B d1bb17c74e7f0882ff94993c4aa1cefaed79445cc413d827e4ba9283df807798f9f11510dcd8078beb7b382c0c18127b269e80ea187e72c12b5c9cc32e885e44 SHA512 01cf87d3a0e2f817801ecdfadefb8e34f18b2676b34488559c324020edf76ceccd5268941f20edaccfd75a4275c1a724f2a7f7d9352a165c438fa0b977878ab5
 MISC metadata.xml 474 BLAKE2B 51884c8074342dbbe0e961495b12b69460ba0429134c50a75c68008fe54a8ea89dce28e114553b433f7c8dca503daee89b858c92995fd0aa4651bd1335e87a62 SHA512 245deea20a81b03063b19e4146982bd6a6d64b363153cdcdde811800c64f8d72861f749eac232f6530889ceb2fa84828db83376039868d3a097b488ba6331ee2
diff --git a/dev-ml/dose3/dose3-5.0.1.ebuild b/dev-ml/dose3/dose3-5.0.1.ebuild
deleted file mode 100644
index 161fafebbd3f..000000000000
--- a/dev-ml/dose3/dose3-5.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_P="${P/_beta/-beta}"
-DESCRIPTION="Library to perform analysis on package repositories"
-HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/36063/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/cudf:=
-	>=dev-ml/extlib-1.7.0:=
-	dev-ml/ocaml-re:=
-	dev-ml/cppo:=
-	parmap? ( dev-ml/parmap:= )
-	zip? ( dev-ml/camlzip:= )
-	bzip2? ( dev-ml/camlbz2:= )
-	>=dev-ml/ocamlgraph-1.8.6:=
-	xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= )
-	curl? ( dev-ml/ocurl:= )
-	rpm4? ( app-arch/rpm )
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-	test? ( dev-python/pyyaml[libyaml] )
-"
-# missing test data
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
-}
-
-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
-}
-
-src_install() {
-	emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install
-	dodoc CHANGES CREDITS README.architecture TODO
-}
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 0df8ca5f7f7f..d164822ea909 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -2,13 +2,7 @@ AUX externalmeta4.patch 675 BLAKE2B 14c3b5c3a2cd0b0224849cce401752c32658a5d0426c
 AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813d2e2fca76c1546bd883d4992c0fd14938b8be1c6c72a5597d52b92e1b324a6e59db58667493685fb3b9c SHA512 2a1e14a3eca3f95ee29e1902324469ab11f117012db60d2f34e0ab7818a44abaebd023562a6f521db7451691219461c453ba5f3fcf424e2fe65e407a11741863
 AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
-DIST findlib-1.7.1.tar.gz 256883 BLAKE2B 7459082dee3cd04045e8dbf59bc82075eb1c24bb8daff4a58d0002d7962ab19c5635ebb0551f29f99f37f1e08acd8eaa4dcd99d213438ff7a77cfc36ddadedd1 SHA512 1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4
-DIST findlib-1.7.2.tar.gz 257747 BLAKE2B 826993e9d3e5a9dab9084b006347a0324c848aa50a42ba1daa0d76010a0cdbf6e1ae9f0754dd3bef84f043ee43c3bd9775284a73ee5b130b678834d14d4ddb1c SHA512 f2aadaf8630482785ebfe6788bfea6716defdd6ba94e7f4e3b743c3415fa5b169e31301d605857823e9c74f7bd2f774399ee32a8acb35e64ce0cba5e98e4dd2c
-DIST findlib-1.7.3.tar.gz 257703 BLAKE2B d69687ee4b75bd7ba514c5507bd474764cfb76f0502ef613c3dd8d8e9e92b5f12704c101b9228d71f2d9f151ab5e63b4352b759a2c7a2694f23b10b6c4e724d2 SHA512 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.7.1.ebuild 1664 BLAKE2B 1af93d91835630f39c86177dfad22f82ec8f9e64ef259a27b325fb5867aecdb1ba413970d004d2e110be24ab26cccdea83e188a68d3826e721bbc69f5d49cf31 SHA512 539b7b1ec074f1c74be90a02c9f98af06129c2703249ef295dbb1210c24c10bf8b2928f7658aefd60d625e9beb68a6003e545444a826acb26f7e685605453e19
-EBUILD findlib-1.7.2.ebuild 1669 BLAKE2B f81ce1f06e38ea45989f44411a33bc5fbaed3cc0c7874750b9609d8843af38e1ab59c00a9a51903e71d09ad8ce1fb575a11d959292eede547dc7edb392ef8429 SHA512 40ad1ccd4d6073356d2bd7b98420db133e0d762679d6250774eed21eed46a37b058ff6d47224fe7a7aa60d919ae2eabc6a177a56c7a6311f1d7f1c9ed55b6358
-EBUILD findlib-1.7.3.ebuild 1682 BLAKE2B ee700751e5f7c66cd8b4e72e430d9b12dea14925cc7d5b2037cc676f8e1375e99ba27e63f5927477c3e57654227aeb5bcc75ea2308f4da4521cf8df5493d1e0b SHA512 ab52c2255948d5864d2eb27c6274b1816bc8b31a98a13c68fdf9e804d029e0a309e57d542e68ccc7dba63de7a9f070a1736d87544f4a8d534e2e9f0a344a7c38
 EBUILD findlib-1.8.1-r1.ebuild 1672 BLAKE2B 13c847cab7bbb9b4d3fb748e4d1150ed6c4e28337e4234a155b411fa10665c1ff741663089a6bb9369797e8b96bb554fbc82ceb55a57d5497eba5bf96c059351 SHA512 6a71a4b101c6787060cb9413e8a02f40fa62b0a0780fa91e64eb59badd03b3b3f1e043dd52482150e88409046a5d8da421f306d91f3d7fa64fa2e4087e994865
 EBUILD findlib-1.8.1.ebuild 1681 BLAKE2B 3e4cca14ddb76b0dc5dcc5f2d94ca4bf4b7e8cdd26696a5b104434195a2b73fb43bcf27338ac7444a4d80ce58cf868d3d309bf1fca59b54d4b30aa398e27a9d4 SHA512 f2de64a87a1f859c2840a849246934052baad12cce4708eb592d63df20915569a6f69c87b9936c3951b2c856d42e50ab3ade8f2182197deb9631be14150e0862
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/findlib/findlib-1.7.1.ebuild b/dev-ml/findlib/findlib-1.7.1.ebuild
deleted file mode 100644
index 3dc2daf05896..000000000000
--- a/dev-ml/findlib/findlib-1.7.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib eutils
-
-DESCRIPTION="OCaml tool to find/use non-standard packages"
-HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-IUSE="doc +ocamlopt tk"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-# it does not compile with ocaml-4.09 (bug #708696)
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
-	tk? ( dev-ml/labltk:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/externalmeta4.patch"
-	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-	export stublibs="${ocamlfind_destdir}/stublibs"
-}
-
-src_configure() {
-	local myconf
-	use tk && myconf="-with-toolbox"
-	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
-		-sitelib ${ocamlfind_destdir} \
-		-config ${ocamlfind_destdir}/findlib/findlib.conf \
-		-no-custom \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt # optimized code
-	fi
-}
-
-src_install() {
-	emake prefix="${D}" install
-
-	dodir "${stublibs#${EPREFIX}}"
-
-	cd "${S}/doc"
-	dodoc QUICKSTART README DOCINFO
-	use doc && dohtml -r ref-html guide-html
-}
-
-check_stublibs() {
-	local ocaml_stdlib=`ocamlc -where`
-	local ldconf="${ocaml_stdlib}/ld.conf"
-
-	if [ ! -e ${ldconf} ]
-	then
-		echo "${ocaml_stdlib}" > ${ldconf}
-		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
-	fi
-
-	if [ -z `grep -e ${stublibs} ${ldconf}` ]
-	then
-		echo ${stublibs} >> ${ldconf}
-	fi
-}
-
-pkg_postinst() {
-	check_stublibs
-}
diff --git a/dev-ml/findlib/findlib-1.7.2.ebuild b/dev-ml/findlib/findlib-1.7.2.ebuild
deleted file mode 100644
index de59d46e91ac..000000000000
--- a/dev-ml/findlib/findlib-1.7.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib eutils
-
-DESCRIPTION="OCaml tool to find/use non-standard packages"
-HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-IUSE="doc +ocamlopt tk"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-# it does not compile with ocaml-4.09 (bug #708696)
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
-	tk? ( dev-ml/labltk:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/externalmeta5.patch"
-	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-	export stublibs="${ocamlfind_destdir}/stublibs"
-}
-
-src_configure() {
-	local myconf
-	use tk && myconf="-with-toolbox"
-	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
-		-sitelib ${ocamlfind_destdir} \
-		-config ${ocamlfind_destdir}/findlib/findlib.conf \
-		-no-custom \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt # optimized code
-	fi
-}
-
-src_install() {
-	emake prefix="${D}" install
-
-	dodir "${stublibs#${EPREFIX}}"
-
-	cd "${S}/doc"
-	dodoc QUICKSTART README DOCINFO
-	use doc && dohtml -r ref-html guide-html
-}
-
-check_stublibs() {
-	local ocaml_stdlib=`ocamlc -where`
-	local ldconf="${ocaml_stdlib}/ld.conf"
-
-	if [ ! -e ${ldconf} ]
-	then
-		echo "${ocaml_stdlib}" > ${ldconf}
-		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
-	fi
-
-	if [ -z `grep -e ${stublibs} ${ldconf}` ]
-	then
-		echo ${stublibs} >> ${ldconf}
-	fi
-}
-
-pkg_postinst() {
-	check_stublibs
-}
diff --git a/dev-ml/findlib/findlib-1.7.3.ebuild b/dev-ml/findlib/findlib-1.7.3.ebuild
deleted file mode 100644
index d77ea4b9afe4..000000000000
--- a/dev-ml/findlib/findlib-1.7.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib eutils
-
-DESCRIPTION="OCaml tool to find/use non-standard packages"
-HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-IUSE="doc +ocamlopt tk"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-# it does not compile with ocaml-4.09 (bug #708696)
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
-	tk? ( dev-ml/labltk:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/externalmeta6.patch"
-	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-	export stublibs="${ocamlfind_destdir}/stublibs"
-}
-
-src_configure() {
-	local myconf
-	use tk && myconf="-with-toolbox"
-	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
-		-sitelib ${ocamlfind_destdir} \
-		-config ${ocamlfind_destdir}/findlib/findlib.conf \
-		-no-custom \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt # optimized code
-	fi
-}
-
-src_install() {
-	emake prefix="${D}" install
-
-	dodir "${stublibs#${EPREFIX}}"
-
-	cd "${S}/doc"
-	dodoc QUICKSTART README DOCINFO
-	use doc && dohtml -r ref-html guide-html
-}
-
-check_stublibs() {
-	local ocaml_stdlib=`ocamlc -where`
-	local ldconf="${ocaml_stdlib}/ld.conf"
-
-	if [ ! -e ${ldconf} ]
-	then
-		echo "${ocaml_stdlib}" > ${ldconf}
-		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
-	fi
-
-	if [ -z `grep -e ${stublibs} ${ldconf}` ]
-	then
-		echo ${stublibs} >> ${ldconf}
-	fi
-}
-
-pkg_postinst() {
-	check_stublibs
-}
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 268135d1d015..5eedaeb2bc3c 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38
 EBUILD llvm-ocaml-10.0.1.ebuild 2960 BLAKE2B bf67406bf61b50af82f34276f7bfa6abe0bf809656e2addcc51efb7c1be5d4137462c9108239eea5f273a0e68f26c3300b3d2cc3cfe9df0c8555926e481fe231 SHA512 05e79634eb5e5ba38e0b0638a9627b7c8b38dfc7c685eaed8571283ed7791eb5d0ae2f6333cddf9b1f0f19b47e6d0e4c10444a4bc8bcdb69ce7061b25440a1b3
-EBUILD llvm-ocaml-11.0.0.9999.ebuild 3006 BLAKE2B 49ae9a36e5a8720945e225659420e22500d8231fcf2f0316437c33198c9aed7645e985c2c938cddb642bad34514f14d9dda6b7fbf1bf1e64f385a0769f527b03 SHA512 466eeba3ebc984efe34cf45386c67a48808e8eb629e2a555feb6994e74a83af6e0f097e21d6370e37339f24f37102b16dcbf2467516aaa39483a9f22ec997a04
+EBUILD llvm-ocaml-11.0.0.9999.ebuild 3007 BLAKE2B b5a0ad3c3edf531e415ceba26a0597bb4e634c21c68d28c36fabcb66c1bd791c8df80dc80d993baf8e95c6870d284c7f3806d52c684586735cef7ba1d65ba5df SHA512 b4e4636c62f25d1407972853441821b2ecac7f04e062808ecad512ffc6007583fec0dd3143ed4f8ac97291e65a8959d4508b08ae351d11c075011f4bca0ebff2
 EBUILD llvm-ocaml-11.0.0.ebuild 3022 BLAKE2B 679d74e8ed16e3cc87396d3e4da97bfbddf353629854abcd537f9da30aa132d5c434aecbee6014547bb55541e84abff5459da083620e637b90339fe031733844 SHA512 ee373b66833f1e77bb29d9ccaa841229e9b78617bd155c671d6c9b96dec3a3973260df58f8b1c0f71f1d3a726bb8fc41f1efa966bedab84644aef27284c65873
-EBUILD llvm-ocaml-12.0.0.9999.ebuild 3011 BLAKE2B 00b8106524fda983dcc03bd0642f506c618e76534f8547b2c92814db9f57502e08c48e329cfec204e1988bd80668b2f7483b2493f85e648f1b942a464853035b SHA512 090967b0e335031c2a91a27bdedec2ddd2cb5120934839b87f92586c72f831a780a05414f15076f71f7a317d907f50d2617677bb0b654fa15e2a58db2d2a310b
+EBUILD llvm-ocaml-12.0.0.9999.ebuild 3012 BLAKE2B 2a52e2223c3dddc396fa276f89e6cbb7b0c87bd81a4436ab9ed232ea245e46daf526c4c264fe608529ba999d8f3adc774a32dff466ca919102f3618917967ed1 SHA512 6a8544cf1b99dd99d67505764661e8a9fa68032840803918550b3d783a25cf911860751ca1fbe8e9185e7f2a25b0fb4c43c8e22a238e46a589a9f5f5152b75d5
 EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.ebuild
deleted file mode 100644
index 5e415032b502..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
-	!sys-devel/llvm[ocaml(-)]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	test? ( dev-ml/ounit )
-	${PYTHON_DEPS}"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
index a39cfca35bc6..f63a8b33834d 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
@@ -8,8 +8,6 @@ inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
@@ -39,6 +37,9 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
index 3ded7e4e44fb..1d3cf3b002d1 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
@@ -8,8 +8,6 @@ inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
@@ -39,6 +37,9 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index 73c0aeab1d0f..d997257d28ce 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,9 +1,5 @@
-DIST menhir-20170712.tar.gz 855262 BLAKE2B 259a165f30f18720ff2fb3457a8ee51dc63202860a9ad097ad6e49e2666480019b7011a11764f2c3780cf12a246c313058a35f07d100c891e07ba3ed7cb20cca SHA512 7850fa031a2bd69e9cf17db6d8f82f716ab5f9e60b34d1a53591a3ff46750fb01880f3282a7194465441abc4c2ba60f543646097f5f0eef6fe78b36266a3dbdc
-DIST menhir-20171013.tar.gz 854000 BLAKE2B d50ce48d32d3bfd588520d6e5a8af4ea628089010fb286df6f87ee3f773273427f9ac6956b4b4bc1c27592aaea1f29447f0223b6b29d9cd0533c47d10eecb318 SHA512 ba6359c471aee62c996bd6495612f444e7ac226f7aad9991a76e4daa2df00cdec2387c488c6a29246ca48079bd8199b94de09a44f1fb05465cbeddff0b39df54
 DIST menhir-20181006.tar.gz 6665871 BLAKE2B 98820922c3dc9ffa27e0f9432d683aae3a1115cd5ba7d1114c57730c7dc679a918c14ef692d1287ca851c62d32aca50a034de1d4c6d4049ddf80e4694bbbae3e SHA512 a838c0b6411345ae64e21f8649367541a7e137af7e552e1dcc3da0c2212813de3d0c359dbd863d0130be897148063b406e0757fd2f18b42d43d3964963ebd4c7
 DIST menhir-20190924.tar.gz 2491000 BLAKE2B 463825aa0f3ea41e49d9c130226bc8bbfc2b96650debf8d79422a90b93338ead58e01aa0c34b2161e4383d1c9a8d77ab58bb1da78e3187ed60b02e13f7742844 SHA512 8036eb8a65f123ceadd21739d88dafca54a2338fc168922a1301a9fbe709ac5e8e7214d95d8114f3798c15f458822e64dcedb94f7fff18ab6f9ccfb6de462e46
-EBUILD menhir-20170712.ebuild 894 BLAKE2B e62e9439edd990293f8ab860de8603a3acfcebaeb8d1822362722eca9fbe2cdd6d515ce744c40a03c7ea97f903c29f8a8c874ec004fc2b7e30cd32a529ac255f SHA512 aa34340bdb35e4e928513c2bed7c5d6f146385d8b5b6bc5a5a1e82ec9d2bf9fb4cf2c4d172f92ba547ddfc2a7b042d0138490e856228dc35c4dd0b8254e8f3c1
-EBUILD menhir-20171013.ebuild 890 BLAKE2B 3de73ccdf507992b5bf71d813d85d669ad4c849fda53a05e3d797abaae8b84f3d298d0f7c7fac9faef70d16fc9d15573a653af1ba7bcf7c6483fb19b79557d29 SHA512 6a8c92fb546d5812910ea8ad9a2bb1de9ba1ed022b382c0b24932da132d35d4f18a2094e91c541171b7678831324cb4b34bd376e8bbfe8c3507b1f392affce5b
 EBUILD menhir-20181006.ebuild 890 BLAKE2B d9bdda28d00ccc0f528d6f7a43abc8b9d394073b5592fef9857b2c06092a6d8f0f7de49bea4b974379b0d789e4de044f456f65984f2575665cb4e2296379525d SHA512 420da808f42896ece95cf6b9487140a3509e1a60cd6c4f4fabd9fadc0c894d3cb054e51e52d6aba16d52ae1af6832dc461eec8fba65e0db12edfccec00d0fb2e
 EBUILD menhir-20190924.ebuild 905 BLAKE2B f04704503fd1c2e8f6375774969e53838798c07ff7109ce5773f509ab5e3d236cb6071c28e83f173ed0c843b343e269d7aa1f46f809aac1f32ca78a053dccb6c SHA512 8450caaa0657159ae143769b4d36169367bff66436a8264ce9d45427c03f3ad266fc04034033ae72e17e6ac6684b291aca91f911393fbb4997f6c0babc3596db
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/menhir/menhir-20170712.ebuild b/dev-ml/menhir/menhir-20170712.ebuild
deleted file mode 100644
index 51e7184f445c..000000000000
--- a/dev-ml/menhir/menhir-20170712.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="examples +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/menhir/menhir-20171013.ebuild b/dev-ml/menhir/menhir-20171013.ebuild
deleted file mode 100644
index b34b8feeb563..000000000000
--- a/dev-ml/menhir/menhir-20171013.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="examples +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild b/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
index 2885370d0a60..2ccbd6c250a7 100644
--- a/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
+++ b/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="A Module::Build subclass for building Alien:: modules and their libraries"
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Alien-Base-ModuleBuild/Manifest b/dev-perl/Alien-Base-ModuleBuild/Manifest
index aadf9facb7ff..7a1115766271 100644
--- a/dev-perl/Alien-Base-ModuleBuild/Manifest
+++ b/dev-perl/Alien-Base-ModuleBuild/Manifest
@@ -1,5 +1,5 @@
 DIST Alien-Base-ModuleBuild-1.14.tar.gz 62072 BLAKE2B 64a94621b36b13ad32861c228e787ca44ae8fbec5f1a2fcd65ade8188c44021dbca45fc7f62aa390d10920f670779511ceb96f214b41c4cce2a6424a0f72b47e SHA512 6fcfb7e5525972d5ca565441717143b036ed9c4079700426df2e96d76a91baeaf103ac406a8fa86dfd820929041525d7bb66c32762258cfb7752fb7634171fbf
 DIST Alien-Base-ModuleBuild-1.15.tar.gz 63870 BLAKE2B dc89d63c31cfe618db58cc11c17190b8e881efa3b245c5bb81a99f4c4263a621747579ea5313f646b171bf7446261b01aa2eda45b81ee0a6ef6cb16c5c4092d2 SHA512 6aa366c9748c8470abef2597684bdd68edb952ec9e8f36e31741a3376bd96aea7cd62caeea47a5ff0fb205f6d2087a63a20baf4767f87321fd54dda2727e1a70
 EBUILD Alien-Base-ModuleBuild-1.140.0.ebuild 1108 BLAKE2B 7e3392bb16db159de370cf1ffba739fe59fbc52b20a9faafb9e3c1ccac1ce692a743c9117a32b23d22edf58a0ce5e85a75058c9d234cce1de5f8e870d5d4f326 SHA512 87cf71c2ff0b47bda8e7c07b0114c0a677bd325fb0fc276e88d52b0760f81f4cb299ae8e68ba163a577c8cd58383a36625a4e7c2fa44f056eecdd3410b484c43
-EBUILD Alien-Base-ModuleBuild-1.150.0.ebuild 1108 BLAKE2B a33c813c445957e6ae8dc155fe77f14b13d509b5f823863aa1b5e1820ae79e50ab49819fa632a3f094bb93595a0fce0f68c84a320bd7629d53af444e13a482c2 SHA512 b94594e794c870c5dc3e54b06911ba9cbfd20e8dc07e3cb0fd51789aaa30a9f566fa56a4153ad05805fa1a615b2cec4f367f493c9b8f6a29cd5159179a016d3a
+EBUILD Alien-Base-ModuleBuild-1.150.0.ebuild 1119 BLAKE2B fa5f6c069382da1950321c1746b88738e9330da024a15f37bf22924a32c82cd17d42daf8ab61e49ad3206157483735ae9b7ff1d956aaa94b94cb403c99d0da31 SHA512 23a2a34b7e71e016df07bf32283c91f66816228c15243fdb7ceab059bd906da2053a52d67e55bf0ad41ad72a3d86fe5958762079fc4e893e02401d1740a7f251
 MISC metadata.xml 1122 BLAKE2B 6b3c55547713e9615d690e18923f9540c2581cf19d13d59c5e701c4fdd2794144fb9a65a8bddeb3922bd9b57f7516803d0b9b8e490ca8576be574107a696ba96 SHA512 6fa6ae3591a2114b245228458b45d710aeca571746996d2f6c4589f3254e3eaea1ac8f63c03b9af78260086fb701378995854f9674e164ee00215e8d02648346
diff --git a/dev-perl/Alien-Build/Alien-Build-2.330.0.ebuild b/dev-perl/Alien-Build/Alien-Build-2.330.0.ebuild
index e205b5421ce5..765813aad702 100644
--- a/dev-perl/Alien-Build/Alien-Build-2.330.0.ebuild
+++ b/dev-perl/Alien-Build/Alien-Build-2.330.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Build external dependencies for use in CPAN"
 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 ~x64-macos"
 IUSE="minimal test zip"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Alien-Build/Manifest b/dev-perl/Alien-Build/Manifest
index 82c8d9c6e1ed..dea6aaf10854 100644
--- a/dev-perl/Alien-Build/Manifest
+++ b/dev-perl/Alien-Build/Manifest
@@ -7,5 +7,5 @@ EBUILD Alien-Build-2.230.0.ebuild 1096 BLAKE2B 56adb9a663198b101a4605c749162a3a8
 EBUILD Alien-Build-2.280.0.ebuild 1105 BLAKE2B 69eff4b4f68be868ac61f8501c4a754a5146838fbde0f9f155816ec792b4951973a5d60ef50573d7a2fc95268068a8e0c5fad0d4b30a701d19b6304518a8e557 SHA512 4ffe5afb1c0a27219e2a1ef6a95b422e8b70c7ec354f947f2465b4254f55aaa6aaf3a3ba44ac44d354ab448b7280747ed84b5c6ef2037a17744667ecc1277298
 EBUILD Alien-Build-2.290.0.ebuild 1288 BLAKE2B b3c53e364157589a0b307efe1f853f19ac2c11a5af069e6778e171ca90520d1b1ddfe9bb1196a9ff71908143ab1f315fd7782ceb35b4db5c6dee5d88481c68e1 SHA512 825e49e7d736cd685d197e1cc8f34a2a75c5ba267bf499845935a80a0c3aa2592e7a106da9f76f79a3ab5ff42e6b063db123678742e3297176dd0369ce1153d2
 EBUILD Alien-Build-2.320.0.ebuild 1288 BLAKE2B a6cca8fe1288f71e230f209c6ec1073e57d7b49332b829f335f3225d77559e59ba738e9ab740a0bcd00e916613923bc764a7f0579fb4b448b2c421527eaf636f SHA512 e8a44d8405f9dfc03026aeaea766a16518dddf2e267239899f41d8563ce220000afe012925d31476978a7f4c77448ecc21fa9e63706aca456d169c0682a9ba26
-EBUILD Alien-Build-2.330.0.ebuild 1288 BLAKE2B e6daf2a165a04621ba4fd0c70b2bc142ee7ef6b9703e9d6b65b0717f75aed1a7306440cd1dadcf90b86db5f8d3734f790f69be7f770086de6c033b83e1efcf9b SHA512 b54db0ecaf744f4237b8bc80f0d8acd552e468fb41f0ec6302bda91acb24326a7679521e702873f4f51629d967fcc12cd6b961f92153614172159d4de4467527
+EBUILD Alien-Build-2.330.0.ebuild 1299 BLAKE2B ded68b15cc416d871c434e5b573e3ad3e04b7241f655bed8933a6448549b13493e4e453a79ee3748075f4eb060b52ad12538866ab891293e1bf100ca18825442 SHA512 87e6de35ed1f0cb790b75a264945d26c4f048d9a6e06ce37ee525e759e0d6002d6db1ae8e57b46638499cdf6ca9830b1da5f8639bf1145257bd624147729f129
 MISC metadata.xml 6070 BLAKE2B fa07bcd25d8424fd55b3c2cadc9c6fce88df3b82cc9e3a527a81ab64c37281f5e24423f8edfcb55a5f1ef8320d0681b97bba3686a5567fba55ab59a0163ffee6 SHA512 330bc596318d3c59e2e71ba7d8ac842ade71832279e55585997e362b740a5523af14a959590ccbdb795aa916c2233d3edbd08bccab7d6c09e4ac6d7198381e06
diff --git a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.160.0.ebuild b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.160.0.ebuild
index 21a54ddbef83..4ba8b8f17513 100644
--- a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.160.0.ebuild
+++ b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.160.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Install the C libxml2 library on your system"
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Alien-Libxml2/Manifest b/dev-perl/Alien-Libxml2/Manifest
index b4545cd74a05..31159653a5f0 100644
--- a/dev-perl/Alien-Libxml2/Manifest
+++ b/dev-perl/Alien-Libxml2/Manifest
@@ -1,3 +1,3 @@
 DIST Alien-Libxml2-0.16.tar.gz 19890 BLAKE2B 50ad3fd53b392de730a140fef350a38cfd2dec069354a45406a524ec1daa8a46cdba2398c20cd29ff6c9f8a2c52f7307130d1ad7d477d9a3b18c1c87a072d827 SHA512 54d3f670047b26934140be28bec5ab27c655daa459409bda00655d6f652f5099b07d2e286f59825a36e7dc56bca1e92a0af19c33582fa90f3f26aff4202334ac
-EBUILD Alien-Libxml2-0.160.0.ebuild 634 BLAKE2B 3ebbb0b73667a74c08f42ef3828130861111bf44d15c6abd324e7c9fe58c5bd309daa91f6cac5e1373f74900fd5ae9c0dfe1a7df347b4323c23d2b8b40b2574f SHA512 1181b669fbb8b1719fbd09d4adff30f4f527b1695811188241e2be0d8b8d941a466633d116b645ababc0774756cd64d2fb60a1a3713891f0f8a0c1d4f169b9be
+EBUILD Alien-Libxml2-0.160.0.ebuild 645 BLAKE2B e54bb047b06eb5250cc7d3d4c15dcbe04f9ab2d7682ee0f70543f2b913be44229f1097ad932dab5f5dce23d0b05b60750d3c943167aceeb2fd2e258877178264 SHA512 3468ee98f1f59ad55c5c3a40eef6f496c2a564101095ddb17f41d7e0f5a91e67b2775acb12e8b17ce8d5cd9bc271bfa11789aabd4a3d622eb713bbee7e85adef
 MISC metadata.xml 398 BLAKE2B 573fb504b4eec6a5e7768737ea93806ae4bc6208333e12d20cce0d26ce0388744d8a85f5ccf74665d37698688bbaf3d7c7a02475b54985e07f21f384f895ddd2 SHA512 92051468292aa25af81ada3e1482231921087d51be86df605c843a32de4ecbe42606da3abfca48f86d19111c2b4d486d65e867be8f3dded6b1e8bc764991c787
diff --git a/dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild b/dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild
index f06b6ba5dd05..feb378446e5a 100644
--- a/dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild
+++ b/dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generic archive extracting mechanism"
 
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Archive-Extract/Manifest b/dev-perl/Archive-Extract/Manifest
index 334f59121606..3c6e5e66ddb0 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 596 BLAKE2B b57cc87c0a141ed829dfb9a807820a4fcd99f777953902d870fec9819d33e36f4c3d6a6c9911f2cdcf0104193bd476013f32095738d679d52c4b0948f9fd3603 SHA512 ade7f9beb8abee53031a221ffe461c3f138524d86b4cadf5065ae50cd29a61893fc1667f8c65ac02400ac89d598c6484480d042cace48fdfc6d2230a4a224a15
-EBUILD Archive-Extract-0.860.0.ebuild 695 BLAKE2B 6331a28962d3e4e7fdc5a48975c7133cc67c352b6cc37a62ff0089214fb05aa366bb8fbed8298cc36c3d6683d3b825aded2db346235e255395ccc8d2fd70b246 SHA512 77e90bbb09d885e1a92d726c71de1f1e037aa12e59e86c9a81a8df267626e41278a384adfaefd49b84b5b92133d070b8315aa1e381d9307720a26cd232d27c43
+EBUILD Archive-Extract-0.860.0.ebuild 706 BLAKE2B f8f9123a8a2b360ed9bc795475863a1af2171c4e2410fece73f320de17f93cc27558bd704f04cb8a274c7b19d242b7d41202782304e3547cb01b2abba9d8af70 SHA512 f4bb0b23804a7fef83d6e94cd13036cfd209afe21a70e23e35f2a32fa538a2435e44e2951c43551087d27a82a6c33e1f124df6309a9a6f9e18936cd808f68913
 MISC metadata.xml 402 BLAKE2B aee0776ccde1281bb3fd9c85a90ed3356049950661f6423ed554548176d57390063843d97ff04911d097159ab7beee830c87049c24d7a50d61cbff69b654e627 SHA512 f29fbff453d0747d68b69d7710ffa8bccd9ce0a2aca7c7e354d044c992aef6562a4d22bab695b7e956861c70bb372fed6b914425f02042c5aa4d24cf06bdf622
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
index 6dee1105d0b7..7626d9fa5591 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Archive-Zip/Manifest b/dev-perl/Archive-Zip/Manifest
index 97a0e39e5621..4a4bb7946bc8 100644
--- a/dev-perl/Archive-Zip/Manifest
+++ b/dev-perl/Archive-Zip/Manifest
@@ -1,5 +1,5 @@
 DIST Archive-Zip-1.64.tar.gz 192005 BLAKE2B 0a9d4c9a7b74fe2136fe42cd10b667813e6528129452b7db72dc42af56ec7187491365ae65653bd475afeaa55440370c23a06ff842d9ebb3dbeaaaab14527ca3 SHA512 7ae4c87ad50b30e764a79ada8f39ea2d698cfba957294d28dc15a2f3b2497923266a00574c5e43ddd59d6ec76d911f39007851920e0f09bfe3f466d46e17d6fc
 DIST Archive-Zip-1.68.tar.gz 163490 BLAKE2B e40d1c029aaf96214cfd91eb56fc200e4128d482d3d05f8e0a787014c9e124bf3618d53ad62a67f32a5404e8b4683cc63aec748c51934199597e7c22a8b1f24f SHA512 40c3ba26b1c27a8b15b919934e7fcd531f208bec73de3454e123ac1fb771831e287b8fade421be40e243498beb6dad9b6133ef07d2e5d407afbd1f3d6a30b916
 EBUILD Archive-Zip-1.640.0.ebuild 880 BLAKE2B ff2cd5f4bcec2d4dd81241c2157b5cd08b362481d0cc6d1fd411d1822ad5b0f3edcddabe03d10bfc2526f39ff3cb38460c461b5e81ea713096304f059c6ad565 SHA512 3e448e3376d5901140aec1923d254d1cc67f56a5d76f737ded90bc0ef5e98deff359bcb44c37ede26c8468863556216885ae71fb743ae183d7afb0b9b3dc160e
-EBUILD Archive-Zip-1.680.0.ebuild 890 BLAKE2B 5e5aefbcf8b85543d97b2eeb65d51dfa5062e784207f8e4b524459ad71473d8f8515cf96d0419a54888b9fa1cce4dda4db7dc5fe8b2752913f63be837d789e3d SHA512 5486018062dd2644a8cb113bbd6d31d3fd33f659b6f2d79e73699f7ad352d93eb56ac35504faa17e18442d3fe6364273189f6427fa5ed30586efcfe95cb71d1e
+EBUILD Archive-Zip-1.680.0.ebuild 901 BLAKE2B a56bfc6569b5beee35e673925ef1f324b148a5be83206205bec34d27fc00ac95cf5acef7d3fda8f51601eabcb913ea9ac20525a7c8f992eafe6283b21c3301df SHA512 5aba7e875716021b72469b8c08f1708774c9e8ffcac41abbae07082fe0075b042e96bf59f0a6ed44164db4b1f5676542d06d50ae88c1eed22f4f41e0eb60688b
 MISC metadata.xml 1187 BLAKE2B 93311e721bebc19566b1108db3e9ec72034db4aaacbbb3abba77d35c5c53ad87a8c57ab7a3778a9062ac452983a0bbefdf7fd11b49c23df07e043974f8922acc SHA512 cab4eed19897f888eb2ff9cc094ba567053eeb115610b0dd4093db37cb8a24488454bfda9b75668f57d37d46e64e3cec5fa300b4227fe40b437c167fb38b690f
diff --git a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
index dbe3cd5593b1..406cb8cdcd79 100644
--- a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
+++ b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="additional B helpers to check COW status"
 SLOT="0"
-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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/B-COW/Manifest b/dev-perl/B-COW/Manifest
index 22e72a40f0b8..cdfd73a9235d 100644
--- a/dev-perl/B-COW/Manifest
+++ b/dev-perl/B-COW/Manifest
@@ -1,3 +1,3 @@
 DIST B-COW-0.004.tar.gz 18295 BLAKE2B 7fcba80755dd7ca425f4f4caf2a39c4b813036d9538cb93f05e4eeb9fb15042c3f185d795da78a9d89c75a969b6f9a181506dcc3d072c390c0bafb514c866544 SHA512 97beaac8056e4aaeafb535a8e69f103632eb3746fa815313f84612414081155ab640299c18b4cb7b9ff0f61263cc1b9ce25de3313bbefce318163902a4503292
-EBUILD B-COW-0.4.0-r1.ebuild 575 BLAKE2B a165f9f80d06a80ccb4333dacfbf4caaec4290e15d816a83ccfbebbdcea180f872eb95e289da33b9f6d6932abd6ba790ad53f00f8fb2bb7cf621f4711e84ccd6 SHA512 4e28c7076aa76741fe949e64bf936582c3ba1583afae4a77e22a729438f87566b5d7e70dce5d3a371d596d3d5dc1a660522fa1c030caa0bd0745bd6701e2f05d
+EBUILD B-COW-0.4.0-r1.ebuild 586 BLAKE2B 2b6e9d92b0eaba1843c4449fd4cb39038f80d4d335db2056c654d19d4508fc2dc2665fc3f67dab16eccc6d3eddc263fe59efb1f8f0fd9a739a4b6f141bc2169d SHA512 d8045288455ecc88b0e91d94974e16a1cc7db4091456faee69041e3c51f039bfa981fc9be7f2c33c9bba256939f1d93da9e70725b8ec22f0aa149c4f46ff3abb
 MISC metadata.xml 382 BLAKE2B aed091ef4956c0df3803f55b4d1cdb8cf33451257df3aa802865e32ddd8d3522abb45d8ab72691fc8b31a8eb44ecde83d8bf23a0b3f058ae12289c7789157ba2 SHA512 1f0eac593d2dde59cf0ed1935cf07cd0bf0029e421a03fe1aaec840ad13dd69ae33d9cb9012347c455da84bd55b1af78c835fdf5a353fde273e1abd0ffb13ed1
diff --git a/dev-perl/Clone/Clone-0.450.0.ebuild b/dev-perl/Clone/Clone-0.450.0.ebuild
index d71a9f8c122e..e934770449eb 100644
--- a/dev-perl/Clone/Clone-0.450.0.ebuild
+++ b/dev-perl/Clone/Clone-0.450.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Recursively copy Perl datatypes"
 
 SLOT="0"
-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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Clone/Manifest b/dev-perl/Clone/Manifest
index 1d313cf616af..1b7ff3f392aa 100644
--- a/dev-perl/Clone/Manifest
+++ b/dev-perl/Clone/Manifest
@@ -1,5 +1,5 @@
 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 600 BLAKE2B f71e4146798a547fea3c42b7d289172371b07c02741f759bfa92a664f9a1fec9d0fc76eae49fd39ea2bc2e0ea6ac8bcfd46dfa4dcebbce7e70a55f401792781f SHA512 f1b3d59162cf8d0db8e1c0dbec572e4a364834e03299f01787fa02e120d35fb7f064c432bba173417605eea5255e9139c6c99b023d7c71c27e918f508b5b08cd
-EBUILD Clone-0.450.0.ebuild 542 BLAKE2B 853ee1b4d90a5e53f0e59c57c59f8c5f1cf86a8b45b7829dac7e6dc741fd2e377fbd19e29b96b1c5a8433d74e1ce5bb97a466ea4ab1bf502ca19e7c8354d1177 SHA512 f65cd75c6387c1a43c76697bb67141ac565c24922699149dacaa1dee32946ccf6bb62de7ae3ccd95860885dbf4ad8eee9252a3f810652f357f7effcdf9e8ceb1
+EBUILD Clone-0.450.0.ebuild 553 BLAKE2B c8b430d02da997aa7cd0581ef3e63cf831df9f928d0158468e01355fb5c1928c93846a7d76ae150ee462a881466755250c80336615c8a072656ecf8f8de45489 SHA512 f50d6a3b53d6af3288800dc69d9ad4e0bb8d49167061e623a9b0ca1d1ca672cb0fe22642a8b82cdcddd23b27501c23fe215bfc71bcfb7f6e16ff07823e31738c
 MISC metadata.xml 381 BLAKE2B 5626d365cfa4134c5838d948102ade74dd9ea2625b20dd514c5b9156d8eb2dca021cd5a54cbfab4db4e2487527d8337cd85a538ffaa1d9693276275c8821873f SHA512 cdae589f0c32e71bff82bd75ce3953caea18dccba25b29661b396a740ac61d392b398399cab3a97e33c16d75750b2c2d1fc8a7e1c9599f9e64d53c042cf15fc5
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
index 3c2e6dc52894..4e8141060525 100644
--- 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
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Guess OpenSSL include path"
 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 ~x64-macos"
 IUSE="libressl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Manifest b/dev-perl/Crypt-OpenSSL-Guess/Manifest
index 64386ae8dbfa..9ceefb5b0253 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Guess/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-OpenSSL-Guess-0.11.tar.gz 11346 BLAKE2B f22d09e23e91c36c722dc9800391b67a1f912f8af6a13ec95c9074e65559585c77e72596a6dae17db28e11f8449813777423a60d9af0147819dfcb91ba489152 SHA512 cdae7f20a15d24842cf117bfba4f3bc0ec7d1066251e0480cbadd8f0aa28c9c9573905726fc1333ea9fbbb3769a67dbf28043de8487dcce27dab5d14a0848b09
-EBUILD Crypt-OpenSSL-Guess-0.110.0.ebuild 692 BLAKE2B aa26694594b2a558559ff6541483e748da7164c3261719640ff3ce20f919a50ac10cbbbf47e5699e7ffb9305e6f670809be78013972dfe5bdaed03f3771084a4 SHA512 dd1558bd78f06cbfd9e40ee5e94c29a6d53a69f44d6015ed0bc5e103cd6e810c4951ecf4162fa42c35731db5813a5f8eb2c4beaf4b27bfe26b9e43947d722908
+EBUILD Crypt-OpenSSL-Guess-0.110.0.ebuild 703 BLAKE2B 786a3e29646a3cda7b95e2768222368d07d49eb4d0532fd64ceee888b7c5f58d4d779bd661e9119683c7df6baee8ceed39b2765bd7ae1b80ca3d3cf2806e28fc SHA512 9a38373a5a3d9f7a4b460458cab0a12fff49e2736c387e8f8e0f54e0c8344367de1923a1e32762ef88e304422bc51f5b7d9d01bfbf5b4cc79affd99f157143e1
 MISC metadata.xml 411 BLAKE2B 777372daa18fae2658976904b22a5e17c15e1ce863a3ca026a03131be84cd435a8fa582c162500ae76881c6605abc8a2737ce877448d62f46e5101c1a9776b6a SHA512 da55f9571c2cec8cd96e6fbf95f74cab2b89cca8c74d32bfd217680f60ea0454b60b6cd851b0f8f841ea07ca2e23cb83764f0e28340eea38119ba216a31113f0
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
index 873bc69a3185..bac64f509ec0 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="RSA encoding and decoding using the OpenSSL libraries"
 
 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 ~x64-macos"
 IUSE="libressl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Manifest b/dev-perl/Crypt-OpenSSL-RSA/Manifest
index 1efee7370d0a..b9ef82c79bfe 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Manifest
+++ b/dev-perl/Crypt-OpenSSL-RSA/Manifest
@@ -2,5 +2,5 @@ AUX Crypt-OpenSSL-RSA-0.280.0-openssl-1.1.0.patch 7018 BLAKE2B 58b6adac6c8d7fa6e
 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 718 BLAKE2B 422cf2673094d24207e2b0edd8ca70b9112fdd9b459f51e89a3789cb7b98fe3199284e4d86b00b8401bd2aaedd5be1c7f4494ab71357275c71e13e60877d1c25 SHA512 3370be2a7276825e31c1638a132e8926463cdfa0adaab4247a3d1bfa8a56684d01fec143c8b21752ea13c498f6c52fee762e677abd10ebf8c597668010c5d9e1
-EBUILD Crypt-OpenSSL-RSA-0.310.0.ebuild 945 BLAKE2B 283dab476abc8d3be033225b8be9d3068541e0ead0af4c9d5d84129cd14eec17bcc0af8644cbc20eec36aa4b3d09e69a862da3afad0831a764d1f27d24353a67 SHA512 dd4b304cd1c0e753bd5b9d62b284bad4fa1035111b72d3c7eeecbcd56a0daf26a514b7a8f7db34c039d218c6ca69771c0defd75bc2948448174524265b4e6160
+EBUILD Crypt-OpenSSL-RSA-0.310.0.ebuild 956 BLAKE2B 9d712aff55f4850831cbacf5779c82788aec135de5628b66da811b47f1511e2609dcb5fa6bbfd14614a556f80a3aa988bbfad43360f796f46be62bb05875936e SHA512 e4f1f2aea85e92ea8d65fe1c85f2d6855eaade74d9fd12512a09617802b9f57c27b390332fd003f3670ae898684d83185b765827f3070e1ee93ff735218b8d35
 MISC metadata.xml 407 BLAKE2B 0dfbb22c5bd94b1f49bf73aa69d6f6ac9272aa4631f93d890a10f8ce0f17df9c3760a79f82bbe4453b4ce7bb1c9dd4a05d838b11681aae42611b8bb9496d2ac1 SHA512 5cd69acf50b1ec86397e96b03d6aca318669f83b7a6276231572634622e889479330e741ac7a858a5c4fd633f40b5c4ca7cc0bc40e6cfc8eb02bee827eabb9a2
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
index 0ece4ab782d3..f52d3da2ee0c 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="OpenSSL/LibreSSL pseudo-random number generator access"
 
 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 ~x64-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-perl/Crypt-OpenSSL-Random/Manifest b/dev-perl/Crypt-OpenSSL-Random/Manifest
index bd937dd7e7f6..ffaa7f3f5b1f 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Random/Manifest
@@ -1,5 +1,5 @@
 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 767 BLAKE2B 378a31d832dcfe9871c510a584a61b24cc502770ccdb596c8822656cfcab71179190a74a4d9bd8c0a43dd9bd8b7ebb9ab4c246a51061573b9c5a272912657e70 SHA512 748227d1dbd91497673bff651eaf4719812259f679bd81d316e51f52d38ded23f36d42270877819a3edeaae8eb88a5d3ab4794ef9ad0e7ebb8bb07cf18c1c135
-EBUILD Crypt-OpenSSL-Random-0.150.0.ebuild 834 BLAKE2B eecd6e27bfed7ba98d72d658441138fcc7d2ed2dddb6621f74f158364b0501efec07a1ad34ff5589c3af298662918aeb65365966ec46c658d18154be0e7f9a7f SHA512 84290b2197fa38e7b18a434282f773c7978ca07bd70f2645f78d67a0125f47d1ea2bc84e037d3b1a305d1fab126e6d209f8e91a3b9d310fb85d4f0d9cce54c78
+EBUILD Crypt-OpenSSL-Random-0.150.0.ebuild 845 BLAKE2B 0f536bf7aa224f47659e2badfac36f85779c287656b5279d117ed9ae970f81aae79e381cb118bc999501aac6293a665364bdb9b8b7d5ae61db02c0049fe1124c SHA512 4ede27b4fc5b007cba4560cfb3c6e0f5ffbe583b68c92c23b0d2bc746d52657b5b6d25e2888696a5669f2065085dc3df53b71fb4b2e8124d8a4e34bdeb3c6c13
 MISC metadata.xml 413 BLAKE2B 03a4dca7d919259dff481a02856287747167ede1794ca2a3307f653ea32c5e34c0a65d32961620ddb1a549da94b1b6a32d7db3f19651a4ff9e93fac03d34b642 SHA512 db707a5e0349fcbf52586739288ea6b95c907918897c611837baab0b8792e58c4864cf785d719af8b8a096c8bc607d2198c5e627dd4cb5a322cbe42c5bfc5e58
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
index 267364b75c27..94e89d91ead5 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
 
 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 ~x64-macos"
 
 IUSE="mariadb +mysql test +ssl"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index f62d4d8c6303..cd114d18906d 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -7,6 +7,6 @@ AUX DBD-mysql-4.050-no-dot-inc.patch 5470 BLAKE2B 09a9b2a3fe033c6ae68b949dfacf08
 DIST DBD-mysql-4.044.tar.gz 155006 BLAKE2B 2934224010bb09aaff9a334b25038a4c7d1eb5552f6ad2b73f44aa7e2d8cb3684644773a89f35363c156cf40867a28943320e1b8b7ef4b9d4b8ac0f6b2417b38 SHA512 e3dd9482e8f78c19dc91baba07e39e266f113ce5a014cfe6c5989c96ed0f85723a17ba6a6e00b65a1ed3c62362400bd3779eb63ed282f73587b4757da249af02
 DIST DBD-mysql-4.050.tar.gz 161579 BLAKE2B fb17e151db730fd6955d3e4424dd495a9fcf5f3f4e2b6b79d9fdc86bc42c3314b68771f1d3c393fd80ea14aeda626a5c5d21f5b921d487350ffd79802edab1f6 SHA512 910f5b4ba7a7890d50a79f37d04ec8971a4f62acd0fe30bf3ab634f66e3128f0cd6513e5c9da8c807a0f4477d0cc766682ea8dd0d8072d02821b78df51f37879
 EBUILD DBD-mysql-4.44.0-r1.ebuild 1833 BLAKE2B df6bd938063675db1406b7111bedc65ae3780ed40476f318c9dcf232defc935ce42ede0cda7c5db87a192abc87393e3ebaa7f9bcfdf85155fbab3047cc6e2889 SHA512 b1de7bc3f489dcf246ef98e82d7bd5b9109dd544d8be15c3aed0737db03252e90beb7c9436ea50e581ea988c10c2e3abddc358ecb5f9eb1a12bfe033d997f15e
-EBUILD DBD-mysql-4.50.0-r1.ebuild 2317 BLAKE2B da73d471c6235ea21ad04160cee02a6ea5459ae42e9efbf9966e8979547f7696ff3ac6ef8a7258b2d852b9a4746bc0e485d0f576413955fa4326329d25a9c49e SHA512 e4fc4d7678a1e04e572ceac9b071a3f9e34637b73d3707e48f8a02c41f879c4b644ce93292cd41a646e9a6bcc16fc2568530e2011ba7446322754d3b6329ad14
+EBUILD DBD-mysql-4.50.0-r1.ebuild 2328 BLAKE2B ffd148c6664ebf02f36d6ce4ba8d5a357046a93664bb830a7e5e5bf205298df499c4bc68beb449b0cd8ed7b5b310b2ede07201c45d7160e487d6c0981ab61af9 SHA512 2036ff49db81f731b7c5d8a9bd7c58a2f93b3ab6f5e65b7193670d0353accc9e49256c7bad6b91e05a0ebdbca7d9c30859ce97d6805211fa16224efebd4d5d66
 EBUILD DBD-mysql-4.50.0.ebuild 2018 BLAKE2B e0f5ccfccc9ee9af5154cee060d73bd22a4f87eb988814b7ce65cbe775558dd25cd155f9cd1e3322e1487358eb28a45a3f877389ad811380ad3ed9bc26fccb6b SHA512 a3a9c71079854e5a516e53bffa2003daa6268622fed44c6d69db0ca0826bf04be94d56112923809e95665bde0b0f13803bbb8396da7ffa868f2dee967e679e91
 MISC metadata.xml 995 BLAKE2B 6aa64b675959e1e02b7480a08f1ba8f875cb2f6ecca588512c46b2bc265ab61d996ad30eba6b487d0b9af14e77ca225a25b53be77dc7a9e7647746f656aa39bc SHA512 916a209009bf9d19b2844ca0aa01dc24cfb3d66a556905b5208e94d9137199e25dac0e56280ab6e012746e79d6808aba7ca9af2987ed78f875dfdf48b642aaf2
diff --git a/dev-perl/Devel-Hide/Devel-Hide-0.1.300.ebuild b/dev-perl/Devel-Hide/Devel-Hide-0.1.300.ebuild
index b83395442753..0a70b12bf3f9 100644
--- a/dev-perl/Devel-Hide/Devel-Hide-0.1.300.ebuild
+++ b/dev-perl/Devel-Hide/Devel-Hide-0.1.300.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Forces the unavailability of specified Perl modules (for testing)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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 )"
 
diff --git a/dev-perl/Devel-Hide/Manifest b/dev-perl/Devel-Hide/Manifest
index 95b342b3526d..acf408777e09 100644
--- a/dev-perl/Devel-Hide/Manifest
+++ b/dev-perl/Devel-Hide/Manifest
@@ -1,5 +1,5 @@
 DIST Devel-Hide-0.0009.tar.gz 6972 BLAKE2B bdca209a8480c9cbca8206ececcda24a2e7f02b41bdc4aa6a998320ca49fb00374f8d23fc105aeee379b50b7f98e2f92ec45d3c752c299377786c19ddd2b2788 SHA512 c1cceb186de73f22132b2b9a16f75389b33b675aaa50c5095615f6f7c22fd0bad9edaf1d66d1cfbec6d536c93583b17a512bcae73310ac6a854e0c98c2ff6a9c
 DIST Devel-Hide-0.0013.tar.gz 9787 BLAKE2B 2fedd205ea881364127c50dc1d0ab62e38ad65a1d2f317324102e1c93a052b46bedeb90e386d508ab76a343b44f42572004966252d7e9abcdb3fc346f657ae0a SHA512 acaa190dcc046ddc6c5bfb300ab2042b87bc43e67d1766cde07a83380ea3989461cec9527e0f7c1881ae7e9ac4aeb75b6255cdda287c280dabb2d5b7b9b785d6
 EBUILD Devel-Hide-0.0.900.ebuild 533 BLAKE2B d1bbe95faba9f7b743ccbddb585111972fd397f7d8cf0f053750bbdda3dc254b3634d793c732b5ed7921b8cce9a8fa7f31f9f9dbd842adb7991ac48361fb3523 SHA512 f46ae17aa28ee0ac0096e00043de3adca167ed1d6b3ce662dd4e5b777290f95f7a8791feb9a417427e0dd6381b45faf6e21846cafb41c3388e37be8c46cf1a24
-EBUILD Devel-Hide-0.1.300.ebuild 603 BLAKE2B bc63c92872ceafc099749d2a7b02f425f6e0819f55a0d6b219cb6a884ab0b610130ac0c9df4e196ac67c4486ed61678e58221904a264f8d28515b81902f475ac SHA512 28f7ad5f5de424ceed38c7cb7526bf2707142880ae302b1f9816884056bc033909143ee2fa9d94a3b6ea16166473c8c12a114f48b77e816e3ebc84bb70232bc3
+EBUILD Devel-Hide-0.1.300.ebuild 614 BLAKE2B 1f2a3a5b9cf557a2e9d5a5ff1d76315b865e1c41614adb195a1e41c9f6a5c2c2ebca2e1317423cd218c092d02dc214c06f30bf9ab6b046632a151369b51c9566 SHA512 89293ad1d6d55bb7b4ad114dcce20681d7bd4ee145ae49942d7ba94a2b9617196bb073af11b13fc217c2ac07cd9fa2421137063b9d04638df809a2430adf1b6b
 MISC metadata.xml 380 BLAKE2B 53eb46b6e93d496af735d02389e7f4ce6473e2e853845a3d72d89f5ee9c1baa53014cb47877a7a6cb0e8bb299d00fb229631619fad7875d4447a6611fbaaa550 SHA512 b5a6fc648c60c53705e595cb43719b72611ca5c50dc3f9f1dbd37c6a739c2b0727996b7546cca91e88bf9801ebffffaba6de7fd21a69918d46972d6d5502038b
diff --git a/dev-perl/Devel-Size/Devel-Size-0.830.0.ebuild b/dev-perl/Devel-Size/Devel-Size-0.830.0.ebuild
index d217102ee556..9b0d5847bf58 100644
--- a/dev-perl/Devel-Size/Devel-Size-0.830.0.ebuild
+++ b/dev-perl/Devel-Size/Devel-Size-0.830.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for finding the memory usage of Perl variables"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-Size/Manifest b/dev-perl/Devel-Size/Manifest
index 26e6e6fded0d..b5d2f7ad83cf 100644
--- a/dev-perl/Devel-Size/Manifest
+++ b/dev-perl/Devel-Size/Manifest
@@ -1,5 +1,5 @@
 DIST Devel-Size-0.82.tar.gz 73638 BLAKE2B 6502f840af79fcf7d81d23cd8f823d4dcfa230acd1298ee1e5b6ac9cfa7b4ffba61c85e81d3020ea627d08b4d9c86891f404c9cb113bff67e14534e73b645936 SHA512 f82d415ededce605840000b07ec29f347e2d926f72e7d5ed1145c5175be92bd45cc0b9c6fad816013d42a34f4ed5f62932dd94d946345637e74cf78776d38271
 DIST Devel-Size-0.83.tar.gz 75372 BLAKE2B dd9c048dda21e6367c01209b9935110bf3eaa8ee9b21d23b2996ca86de065f28bda20882313240ebb16c624476c4c89b8ea51dacfa4ce3cda683098e15193c94 SHA512 cacc484d57b66bf84b92297c594635f41310ddcd87c6f60a36669cd9c9a6e1405b19a5bbf0d57d795b8e45c9e6c470d84bf56384c0c48637cc0617c5070c31e6
 EBUILD Devel-Size-0.820.0.ebuild 485 BLAKE2B f3fd227acba6c9be522a57345ae837cd05d52f405e264aafb08c277323aa2b018b7969241d693aeb45a9576e1dc2e81416c91d2a5bc72f90e8847cbf32b7bb60 SHA512 81d70770383f3248a0d773a68a20fe9e216ebad43898891580bec6ede89626d540083ed71cc585caeb431de173eda4883e35439f4844df4ad2a4d91988b715ff
-EBUILD Devel-Size-0.830.0.ebuild 572 BLAKE2B 5bf9a2a265cc70c8117cef0702e34744a722d755c3c6f2858956e5ae1aecd6bceb6d24e6ccba6e7639f57fc53a809549e96e95767e2ab06fe030dbe612e2ca2d SHA512 362f61b7aa2fe5a3c77baf8d2f82f6e22f5e26bd50e29cbbed203350f3bc4f06f9ba039694919ba8a3651caa3d3e8fae9f1cfd373f7d062ed920790967c55fd8
+EBUILD Devel-Size-0.830.0.ebuild 583 BLAKE2B ec61335ab5d642cd732347e192905a6c062d54ee315c4a3674309b0fc88e8f04fc3630fc2c8f0cf1b443b6de1000ed3125f5eefc7243bcbad5aaede0b151a079 SHA512 b70fb8c2992fbb65eef979fea20c01b907a0395da59c6dd4a46fdd94a89d19178f8066d976a460915a00d4bdb0b60a10c707be305e51bf2a0a675338433ed32b
 MISC metadata.xml 392 BLAKE2B e026503c50a9d3b69c5f8747713e7f09f792714a80b2e27fec3b23b5c87b44e9a5163693db124193abb15dba5098f13e99e97564d45aee2eb86f6571c37d2912 SHA512 d276410010ad82f281235c712d46ee2ba6294c3a01ec6bd7ff5b1d0f06a05275aced05598fdc646a5e5d3ca08bca22c4e9c529cd0e984fa9a3a3c400a8475895
diff --git a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.270.0.ebuild b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.270.0.ebuild
index 387822ced163..1ccba80c575d 100644
--- a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.270.0.ebuild
+++ b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Check that a library is available for FFI"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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 )"
 
diff --git a/dev-perl/FFI-CheckLib/Manifest b/dev-perl/FFI-CheckLib/Manifest
index 065bd5fbf6de..d8f84723772b 100644
--- a/dev-perl/FFI-CheckLib/Manifest
+++ b/dev-perl/FFI-CheckLib/Manifest
@@ -1,5 +1,5 @@
 DIST FFI-CheckLib-0.25.tar.gz 28512 BLAKE2B eb9a843d230dc048fddd547c1fdd1a3b748be8ba3a3bd2d84930264ed11427bf7966843c4b394534b4429fe1c3d1632f180add05a92a587b472686459c608ba7 SHA512 f6fd790bd6b5e64972f2692abdd81dcd617a4b9ca377bdced655939e1b6005d2d84dc49df67d4945ff5ae0e7ff955aeccc019bc522fc959f1831c0586f40d313
 DIST FFI-CheckLib-0.27.tar.gz 29371 BLAKE2B 194ac6102f32d9107e112d20ea85d82ce8b948f0d421f29b09f3557548a593991ee8cf096e924c09a0c7195a32cf666ee8e01af41377ab3d8cc7bc245e6ad23c SHA512 0a6cf93fc0461e6b21533007b2d9956f14bf7acf6bffdbe5274b43f8c3d9defabfb60854e31b95cfe430d2cecdcddeafdcc9514daca6a4807697cf10c280a6d7
 EBUILD FFI-CheckLib-0.250.0.ebuild 587 BLAKE2B 0154392ddbe84d7b0f8df287f9feddd0169c7a3dfec20a22c77be7558f92a0b88a52041059625f3d6ee19f2f41e64222a9def218a8413f25eefb697452e04b33 SHA512 da261326b59f88cbf3374c1a21d70d87bb5b41dc0ce51807910a5040d4088235befce736420276563546243aea16139f865e1a51fcdb65245dd98281cc46f498
-EBUILD FFI-CheckLib-0.270.0.ebuild 577 BLAKE2B d6bd68d6e43446a5d347fcab7f74d17350783add034a6539059964ac85cedfb0034d1ce66659127b58eb381040d42a7ed37c9077ebbd0e685f072ae4d39bf397 SHA512 2b2e4e83cbaa54dc4476c7640dca4daafe528278f64fb5bc029142e17cec4ecd37c0ad86df9f17423e329b8993efadae69ea38c5ad8f28f7a07aba27950c0d70
+EBUILD FFI-CheckLib-0.270.0.ebuild 588 BLAKE2B ccbf67cb3db23045c02cf305e9bdb0fc5188c39cb4a96b1b3e8e2f36c955e48a88e80ce542da61e3426924b96a699cf33e93695a1cdb7d6389d7c1a0aae5aaec SHA512 485a36e5813e9bd48d60cd1c1b987b83e4ddea66eae8da88399d39a6fa505be4cda4aa856e889748ded6928d0b360d0e30ba12942529f99a9f74d1850f903744
 MISC metadata.xml 396 BLAKE2B 3a8692f73d6f2cf8012bfc60fa107ebf582b75409735eb8cfc8ed9a5088fa26aba51230353616a2b4ef26d8a80205b3204f7624782ec543752be173350ad6698 SHA512 d1131f6d33aa0053a0b7fb7a6d3beedf924b19a55034c724e5146faaad810ba2381f74a8f14b3ddf670482a54f39c2c8b17a2a13fee6767a734a28c30eb35c1a
diff --git a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
index f5ec38e4586a..18953368ea78 100644
--- a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
+++ b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="uses File::Copy to recursively copy dirs"
 
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Copy-Recursive/Manifest b/dev-perl/File-Copy-Recursive/Manifest
index 0e3b2848a799..9d920864b55a 100644
--- a/dev-perl/File-Copy-Recursive/Manifest
+++ b/dev-perl/File-Copy-Recursive/Manifest
@@ -1,5 +1,5 @@
 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 486 BLAKE2B 49bb4bc2ebbabac8f462b0b407370d4e2c66f382fe2b516bcfc98d75fa670d00625ae52b678fea30f29b27da9d5b7a9646f53b52643cd18a49cb99539c586bb1 SHA512 bd3426493689efcf6ac5055a1fa1e78e9eb6199e86146782f1e8699cc5e164b64828a5de769295551f52ec3afd6ea30bd9631c56c501603e70e97b4f1662d74c
-EBUILD File-Copy-Recursive-0.450.0.ebuild 642 BLAKE2B e6764d2b7d129aff35b96af3b85d4634ca0d2396afab755d6bece31ebbb3881aa261b5cbd39c9ce904705b805210a87eb82cb60b3f734108e479bfa1804e3372 SHA512 445b044ec6643e8b91b917e9bc63e1f694b7b3f261e7a7371bea464e4122cf4cc0be35c6711c3e817eee8533ad32e7de89420a84723496f9d031d49cac40fffd
+EBUILD File-Copy-Recursive-0.450.0.ebuild 653 BLAKE2B dd104d6ae3a1fc0e8667d0ea3bf98c4814205c6e54ed7fae13780a368c7d9b78084ac6c2c8a59c4257b4ec95ef3b9fe8bdd87d3179608a11e5069884f812e499 SHA512 65db111b28906806c1e4a46b30fa4e7febba460c77b5387a3e33cd114a971565610ba86ceb92d365b5ea50209b1801a37ac1cf43f9428e7e034d53b2155aa096
 MISC metadata.xml 411 BLAKE2B e7ad5cf73916c9e73cf4f4ec8985c1e607ce601014c696d4b50f3b86133a7b811e292212987ea29146a103da68a1562230b13e0f7d4b6f3d2c56cfcc4274682c SHA512 e985cd6973bdcc89176854669990e5ae810cef2946925d89a2ca976534a4dd483861d30221e51704445dd3b80d1790ca7202b9a41c9c87e90736e51ea5f149dc
diff --git a/dev-perl/File-chdir/File-chdir-0.101.100.ebuild b/dev-perl/File-chdir/File-chdir-0.101.100.ebuild
index bc5dd1f44be3..67292bdf49a4 100644
--- a/dev-perl/File-chdir/File-chdir-0.101.100.ebuild
+++ b/dev-perl/File-chdir/File-chdir-0.101.100.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="An alternative to File::Spec and CWD"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-chdir/Manifest b/dev-perl/File-chdir/Manifest
index 429ecddbc680..26b59249b9fc 100644
--- a/dev-perl/File-chdir/Manifest
+++ b/dev-perl/File-chdir/Manifest
@@ -1,3 +1,3 @@
 DIST File-chdir-0.1011.tar.gz 25127 BLAKE2B 19c07b54bb55bb3ed7f870cb1bfb558f7b8cb9a34295f3e885d1fc6a56e8ba9232480224bed0c32f99fa4efe27f2b72808ecd8e7ff0c4853625024e9727392a2 SHA512 249181e43faec925406b1fc86fc256afb27c588a4325122defd955f0f5c15c9d484f515841e6ebb3a643ce5e2a188338c88eee0df76a458aea4216c26bb7d6b7
-EBUILD File-chdir-0.101.100.ebuild 605 BLAKE2B 2ce3afbc8380b99ad426707a25c44f8d2fc45464952f3af1ccafd21185e65b1e55c84f9fea3f3175e56dd65ad4a7124650186de39bcc443656d90c1bd590fa7e SHA512 4e57060b26bd019388503f62f815d069664ac239f0c0802b1f48b407c81c8c4984ee6011afbf371ca4b095fb63e5d2128a05a90c75adb62c3c2a2f644b22ad9a
+EBUILD File-chdir-0.101.100.ebuild 616 BLAKE2B bb54ba686bbb924c7271bb78372471307bd8be85147d1a84db045322a61b872d8490bd7f58c2fe565f2d656e45e3471f65cd362c00ad550ba74873871de31142 SHA512 386a238a82cbae3f25619904bec01429c669636c0ee4ebe005e6e540e5345c32514229ed422865e8f050d39bd0dad566294d2f16c1ffe5b64efe37ae676fe4d2
 MISC metadata.xml 523 BLAKE2B 920de718e7c2a761a155f2bb37121050a9021d7b4cf487bf0413dcfa583498ebb14f42854c3c01943f9ae19a555fcb6e279b44aadf233fd5fb59792244287896 SHA512 68464b827e1e3b76ed524e0d2cf4d6f822873ae58b0939490f60209fb7eef200dd8c4d6dbaa3b402639a32ccc06bad7962ae6dafeed8a3ce8cb5145810157371
diff --git a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild
index a6496b0f97f4..b3baf1eb231e 100644
--- a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild
+++ b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Lexically scoped subroutine wrappers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Hook-LexWrap/Manifest b/dev-perl/Hook-LexWrap/Manifest
index 88478359028b..e174cb6b1022 100644
--- a/dev-perl/Hook-LexWrap/Manifest
+++ b/dev-perl/Hook-LexWrap/Manifest
@@ -1,3 +1,3 @@
 DIST Hook-LexWrap-0.26.tar.gz 29479 BLAKE2B 63c4128655342b752cb50347769674f40edaf633ea47b0dbb1f3fadc4bf9e1342bd810aab891f23e8d2c5918e4b4ebf2bae92f29910d6834da499e8e2a7c94e2 SHA512 f7771d4fb8379f43fa5b864e345f4526603914c3c486c637ea07fb9e2d41569bf40948a9039fab7d10c683fb85e16a8653876613903d34cc6801fcc9e92aa58b
-EBUILD Hook-LexWrap-0.260.0.ebuild 624 BLAKE2B f22d1e2e173a53cc8b5176127396e9af065a29102b49aca7de2a7fa644c1051f49b3b5dad1ca125a52e8408652d2c56f5b6ab6fac561b6e10d078271e453f03e SHA512 58c7b3d1b46ab4c6bd800cae29d91687431535adebc0b54089a4b660ba8f6ebcc2dc0e1ace449fd26e916bc1639040ac6d78b48daed129a48e1b9ec485a02a50
+EBUILD Hook-LexWrap-0.260.0.ebuild 635 BLAKE2B 21ba2807d8d144dea3b7dbc1ca0637c0dba64566badb1ca814e91e02ee229c10c34b59c6fa2426517968bf4e5afc44a687010861d055dde3f8cbe5899c79d93d SHA512 ad1ac84a4a1b5e14d0f49b5253e26cbb4c31a4004791d175c215b59c7c768d6edd9e6674326d9fdd3bc63c122cddede38424a0863908fdd57e3feab6d433d7fd
 MISC metadata.xml 396 BLAKE2B c39442ccfdfbec2b370fd16fcc3575c88d66e9ae77ec96935fab7c9797c072b3cf2417ca5799860c86d846db5d5b4a06f48a41ce848e40631f5b8e00eba80195 SHA512 ad99fa93dbb52689ea61dd31590e478da4c7dd7a1d384019aeb506d10f889882e32bc85567812b1a1625afae6ea56c57abad658a35f939655f8b362adf1eb8e6
diff --git a/dev-perl/Import-Into/Import-Into-1.2.5.ebuild b/dev-perl/Import-Into/Import-Into-1.2.5.ebuild
index 7d88089fc3a3..b7c6df25bd30 100644
--- a/dev-perl/Import-Into/Import-Into-1.2.5.ebuild
+++ b/dev-perl/Import-Into/Import-Into-1.2.5.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Import packages into other packages"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~riscv x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~riscv x86 ~ppc-aix ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Import-Into/Manifest b/dev-perl/Import-Into/Manifest
index 32f05a14bacd..e4e5b381cdf3 100644
--- a/dev-perl/Import-Into/Manifest
+++ b/dev-perl/Import-Into/Manifest
@@ -1,3 +1,3 @@
 DIST Import-Into-1.002005.tar.gz 7748 BLAKE2B b237668b4b2cfbf241c3b731d7729d0ee949720622acf672eea77949dc3ff0b4887b7833a866a082ffa4f368c0b5e9a1e66b0a4088ac65a67f9369379a0213ae SHA512 d356307072da18bc40b25f11583018ed416cb87178f080982e14e98e53d42bc1e04aebda56d595e707c05065eaa6ad7a6b059920e8b5b8e1589bfd68e26900fb
-EBUILD Import-Into-1.2.5.ebuild 490 BLAKE2B 7965bbb3ea1fb83da8792c5cb1b33994984f905a358a479e40eb96cecd6e40bae9a722f2b2124ba2c861877d8c1dcb8626499389c64a22601538885ea0eecdca SHA512 e4645169a6f186064e301be57a12aeb073748adbf81edcd8f5561401a2be1183f1f9dea7e8d3f14d9efc59a896803836fe90d87ec01f1075c3a34a0ee4b174dd
+EBUILD Import-Into-1.2.5.ebuild 501 BLAKE2B 410a79a350d73157437e1e95c33e1f2692f908c73195a7bc262c7be77d329745a0ac86870f836328829c41be8bc2b28fa470942f44cd2beb18e1b158817ddbbb SHA512 c67946a750e2477c8a3b7c494e25dfe0fef943b3270023112d982e4e7c2b9a6fe6cf5b17de4d5b0c397eb0cc52fa6e3a464e028e6d3e9de9de8544934d6bfd35
 MISC metadata.xml 382 BLAKE2B 6a8a2b7be3a319e18a7014dc3c77d2b9911b4e8672f2bfc159668c8fe1ae7a956616a5fe78963a6806fa2190776229283ca1b69ad3b1c8439b14d1c3e1c09709 SHA512 17a33278cd9d3fd608f81c2c444047e64122852d669d0fd8c0a1fbf58eb051cd00d718a59917de610630dd9cdeaba607397a72731533cb27de6d0400566632c5
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index a2129ce78417..574429d9d3d7 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Pod-Markdown-Github/Manifest b/dev-perl/Pod-Markdown-Github/Manifest
index 4d666657c920..d3bdc6cb471c 100644
--- a/dev-perl/Pod-Markdown-Github/Manifest
+++ b/dev-perl/Pod-Markdown-Github/Manifest
@@ -1,3 +1,3 @@
 DIST Pod-Markdown-Github-0.04.tar.gz 13465 BLAKE2B 6235a3f4460b3df44606a7dcd5a1ca09be644c02b59bf1c63a58a27e3d596e88b2ae95035c7bd44ec088cbb71fcdde4a8c9756894a419293eed7b0cf4f180ffc SHA512 cf0b385ddec44d9b21259fa867746c71b0880d85d3b24b9bf8c530eecddd6f899654425ccb29170824fda3cc7f432cacb2d8974ad789952971c16b2ae901ace3
-EBUILD Pod-Markdown-Github-0.40.0.ebuild 583 BLAKE2B e10825ac48358503c309373502bd94188c38d65190710d50fc82857da3b682389e7d8f5c7e9e8a5182fb50df5690561aab6a4d60ec8db7cb272467616721b6cb SHA512 1ba09b8fccfbe6ddd184150f596d8d58b5edcda2654af98e3d9cdd4faf1a9eade3ab9b748d1efbcaf23e1092a3e4fe0f8aee9d7cfbc46fffb1cb03e400d9ab92
+EBUILD Pod-Markdown-Github-0.40.0.ebuild 594 BLAKE2B df480d84b58aee033e4ca067439b48488229a7bb05a747bd2efa1a71f1ac5019fac6a845e7a6c6ca4066f5e2cd885f11875fbca9f71b654b0d0da33ace191218 SHA512 97c5c0af32bca52283960d7dee999d5ce34ca8b5dbe00e2e444e2129e5d0d1041a9acef17e2d832a4c52a5c61968c547b626b912c4b819f55d4523732543f9ba
 MISC metadata.xml 411 BLAKE2B 7e2898e1aede1aa843eb1ef39f158bd51abeb040e35adfaf7f22356c259985cb408df8053e6b1ed0a66d3ce6c249082479f0396d67a91ebf56786fbeb692dab9 SHA512 959c763dac53fa9619d49f827543b5ce65a7dd208415aa38efb35f3e04225aceaffca7cf7ec12665c366922fad1b0b384e8caff7f4617aa9c63ed6808fff7ed8
diff --git a/dev-perl/Pod-Markdown-Github/Pod-Markdown-Github-0.40.0.ebuild b/dev-perl/Pod-Markdown-Github/Pod-Markdown-Github-0.40.0.ebuild
index a76dfc68d77b..8016b450ccb6 100644
--- a/dev-perl/Pod-Markdown-Github/Pod-Markdown-Github-0.40.0.ebuild
+++ b/dev-perl/Pod-Markdown-Github/Pod-Markdown-Github-0.40.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Convert POD to Github's specific markdown"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Pod-Readme/Manifest b/dev-perl/Pod-Readme/Manifest
index f8cc16efb402..828fd1dd23b1 100644
--- a/dev-perl/Pod-Readme/Manifest
+++ b/dev-perl/Pod-Readme/Manifest
@@ -1,5 +1,5 @@
 DIST Pod-Readme-v1.1.2.tar.gz 47521 BLAKE2B 425bc20581e7a60c89b6df956a2f3ce1bc0ec5e8a64593c12a28d4f8f2f88b8e653cc12457c69c48d8a6f42567ef773a30109ce65ee4bb623e9c3981fe07e45f SHA512 b8d2cb11fa2018d91b4623c471206c057046daf2570500c828f6f8fbe9ef8fe45e4977396352878c1ca5a47ec27be04ca53c1c9240e7dfc09a9405b0af5dcf47
 DIST Pod-Readme-v1.2.3.tar.gz 37001 BLAKE2B 2f981a609dd92b128ae986662a292a44393527cba6665ba11b7a1ee3e1333f767bbc6f4018dbf096711c67350378d78b1e50a2c84b08d3492b94324527a1b852 SHA512 c9518d3fd3082d6c4bb87300e04e29cb14459c08e3573bac6542ab4d4842389eaabb0d37fdc018ddb971e876b30078d14ce007840c867a7a81c0952c77c03a66
 EBUILD Pod-Readme-1.1.2.ebuild 1471 BLAKE2B 5c444923651e859fbb8ef61dabd58934d046dbf76ce9c8bba9919d971cb48018dac8834e979dc9ec149159a176a4bc8a957516c8a7eee5af56dac8e8630e1027 SHA512 dfa97cc07e56c7ea1a1c56e32d6467b1c73b96b176564085a21d752694b8523768afebb7eddefc1cd8df69b1d43c065d34a4e3433338fa99797e2f87497c3719
-EBUILD Pod-Readme-1.2.3.ebuild 1397 BLAKE2B cb65defcb125f1c1f51797a7848ff61e6ecbf0433ca143a4c8503291df106277b0f7e9caa803ff9157b7c503ce241dc23ee005213cb54a89bf954ea0b4b61f72 SHA512 22359443184b88d39dfc190e5854044e964b33909e91238ef044b2973e4319fb6f3764ca95914b616a7069833a953fb55a7bfb57fe7ced66523d503866342b7d
+EBUILD Pod-Readme-1.2.3.ebuild 1408 BLAKE2B 2ae953baa11529bcfc0fb36d2aaccdaa7ed071d9d806386f88dfd0f5c363a0eccd7b8116e982773ec2de51a99d6bc74c10c7f12467f2012e243d926e6c67afad SHA512 d18d78404bfa82a5e8190e10fc34050be32b452024d90c7876564a85f9d6fe1dd135f96d336309ff7be8963d3b2c292e36644ca1e43122dd657f096ce81419ba
 MISC metadata.xml 927 BLAKE2B 98a314d2ce226f49e7f55cbcb376dbadb9d0d4781039e40848cb8c2ca7480690ece4106ead5e2916ca2d68e44fc0663988ee8ac7592a21c5e283359f4192e24f SHA512 596b6905917ae2033925849d4428983bcaba40ed3f5c4944a0f0f44d570c6bc3e301b9f83d50cabaaeb4082887a4e40c1668bd56ed286881e6b203ad19a0dd26
diff --git a/dev-perl/Pod-Readme/Pod-Readme-1.2.3.ebuild b/dev-perl/Pod-Readme/Pod-Readme-1.2.3.ebuild
index 7208001cb6c8..5e1a7d070763 100644
--- a/dev-perl/Pod-Readme/Pod-Readme-1.2.3.ebuild
+++ b/dev-perl/Pod-Readme/Pod-Readme-1.2.3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Intelligently generate a README file from POD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Shell-Config-Generate/Manifest b/dev-perl/Shell-Config-Generate/Manifest
index afd27029df94..6d256688f196 100644
--- a/dev-perl/Shell-Config-Generate/Manifest
+++ b/dev-perl/Shell-Config-Generate/Manifest
@@ -1,3 +1,3 @@
 DIST Shell-Config-Generate-0.33.tar.gz 28382 BLAKE2B 5bb797e79c0adf5176c1e54cabe2ad2776a7431427601e980942e86a7715b2b08e732d3489203b1fbb64ef3580b5aab1d92a6eca71b068c250346c48c2c751c6 SHA512 57041179a9798ec4dde78c13770fc58499776201891fe865baff4cd00efe6801411eb3bc1f89271cf4a35edf4782de33fdcb8a572c6c5adba188f50a13755bd3
-EBUILD Shell-Config-Generate-0.330.0.ebuild 535 BLAKE2B 142927b9da161e45ec2cb34c34463819b0a9782467924c54ec9befc9bbe6a7c6fe9c8492aa763323e3d701ed5549ada2d498a80890d577e422428749cab8444c SHA512 5daa1539e3739d2d876bdb1cc0c5c9d2f5e64e2db1b805bf3fc96adada8fa7de38d59f53d565043d7248c5f6282d04db176b5c1fccdd35a1bc46d0a8c9e693f6
+EBUILD Shell-Config-Generate-0.330.0.ebuild 546 BLAKE2B e33de86952c296a08be74fc40fd7a56f024f29ed7407a81712faafb604de0b12ce483eeb495fb3fe7403d85c7e9ce3213beb7b57c0d78aa4388fce5cea16f8db SHA512 c4971e7ad2d622701620e1c73ffc9db58f14595c920b6aeab6fd45edf10dfac9e0f9ae19c123cdcd12c8f5ced693fd619e4ddf888eaf935a6b700469bdee4821
 MISC metadata.xml 535 BLAKE2B 6e28795a27ed633870291abc39e309befea214a2ddfd21df34a1685b7938fad3d84626d06c6918e508194c54c495a5822db5c6078f62b8d0d1e4ab8c2a5fad01 SHA512 668c884c03be99153dbfd33d31ffbad488974ec1a216f71b9d35d7322196bfa3ef5e01f7b08ea86064d57b95ecf8ca3507a981ed60d3baab4b1bfeb8324d9995
diff --git a/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.330.0.ebuild b/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.330.0.ebuild
index a8d65f53a2e3..15d6f4b0acf1 100644
--- a/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.330.0.ebuild
+++ b/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.330.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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Shell-Guess/Manifest b/dev-perl/Shell-Guess/Manifest
index e8d9b1d4725a..e384b2c0a821 100644
--- a/dev-perl/Shell-Guess/Manifest
+++ b/dev-perl/Shell-Guess/Manifest
@@ -1,3 +1,3 @@
 DIST Shell-Guess-0.09.tar.gz 21663 BLAKE2B 1d7ae26373201348bb6b38674f929cc6e9c4211a3f34f0dab80560bd7a79771748e4036ed3c7d08625c435babdbe8d975f593e4faaa7b55eb92d164d2c0041b2 SHA512 60d8b315491cd10eb2cb1c3941db6369d93148e0bd500c72bc082b1673624dead6485d4238e241127c3a04a0f776222fbb90a40af6a327ed9e2988852fff544e
-EBUILD Shell-Guess-0.90.0.ebuild 463 BLAKE2B 66d01615a2aa77779df71a6633bdfb181f3d7597866fbfaa5fa72e4d456bffe8b8b31a527bda45bffb10b997e2b91b067867c281dd2675f7bb034c181098612e SHA512 050273a570c407d56d57872139e5609f6067557652840b800b08e844e8b1a6f69aa345905aa3698adcfd07502864e20d8318e106b9712faa784224c9f17e83b5
+EBUILD Shell-Guess-0.90.0.ebuild 474 BLAKE2B 940acd2c0347e14c0e70f7f82f97d1e05bf96a3fdfc959066b000390885d41479e4faff72757e89cd3b0d6921956df11ad057c947d559299515e7c328b42101a SHA512 2b7803e69949e97fc49327d6c9a4c8ac21cb5c6ccf85e4b96e93632d9c0829c745b4a4dccfb318c49ccd2c6dd183b6a50ecc5ea95e1ae4d10434e3f3e72adbf2
 MISC metadata.xml 514 BLAKE2B 06231bec1a1089ca9b6a0be47c047a0886d088c8969c85be0123f375f0b1b8ae242adf33b30ecdb31b8e1121e5090dc4ea7f99441781ebc0e93a5a23b768711e SHA512 023675dc6d5c6d2a5f426519aaf6f1e7351716c191349bf46fb86c61967796c095b38cd6cd2cbd8d09102daeafdf9802b4941fafcc06ba8f8763f028fe2a8fc0
diff --git a/dev-perl/Shell-Guess/Shell-Guess-0.90.0.ebuild b/dev-perl/Shell-Guess/Shell-Guess-0.90.0.ebuild
index aae4183a1014..34b7e998c02f 100644
--- a/dev-perl/Shell-Guess/Shell-Guess-0.90.0.ebuild
+++ b/dev-perl/Shell-Guess/Shell-Guess-0.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Make an educated guess about the shell in use"
 
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Sort-Versions/Manifest b/dev-perl/Sort-Versions/Manifest
index 1045d84e2507..ef19eb08d24d 100644
--- a/dev-perl/Sort-Versions/Manifest
+++ b/dev-perl/Sort-Versions/Manifest
@@ -1,3 +1,3 @@
 DIST Sort-Versions-1.62.tar.gz 12295 BLAKE2B 31e3456a2d36a0ee07bc8cd5550218220bf48dcc14dedfbee167ff0d2ded54c4fe14cfc0b4018ea4e91bbafc01ff3ac1b52c3301ab90207ca373f836bd7fcfc0 SHA512 b30dab96a5a31023af3ecee1857ae7bf5abc45b266294b47abb4f03c332b27825c1139d1a56bf0cfbd538487d28b3be167d83f9f5a93f079717b40157abe4d96
-EBUILD Sort-Versions-1.620.0.ebuild 572 BLAKE2B 6433bfb6baf556a94637bbe9085fbf86e8c8319dc6e2f4258ac31209ab61610d2d308dc6db2d5403b9059ed746a8fb6006b2bcac11de409fe905219b86cb8d50 SHA512 9ca6185aee3798a3da9f903e30191ec528a450de102e1048372003b0a6ec61c1c9d1158e0dea9d37ef5c29f6c5647c266c69bcec8fa61d9466125a37d24b1ab6
+EBUILD Sort-Versions-1.620.0.ebuild 583 BLAKE2B 018fab712a9c99fa2b2db08de795dda1a4cd509d7953df58fff3b68c7caeafcce5a542bae74b771191baf3a88a9f5e9c0b297c46765cd0915370bbfae7c629dc SHA512 60b2e6b86e6f2a474004dfcffa88078991fab70bc49547825faa8269f6605e7bbd3ca8a6145145067e914f3026088c0754ecb5499401843fe9dd7f8afa3c98c5
 MISC metadata.xml 398 BLAKE2B 591daa83090bb753b91dc029267f960b21aefc7d50147a909640cd0b60b28abaa446081d099ee2090420d503df0d3aee2b2e9a71f0bc4c06b708079bd6d00fc8 SHA512 384c92b32549a79abba0a37d671fddce4a927d6ceec6c89d9faad2c058692cb8ffed54392b98f0e13eb12093997bf9b4345c0a9165b31fb30086db766e4d83c9
diff --git a/dev-perl/Sort-Versions/Sort-Versions-1.620.0.ebuild b/dev-perl/Sort-Versions/Sort-Versions-1.620.0.ebuild
index ed9aa6b00953..a3881280a355 100644
--- a/dev-perl/Sort-Versions/Sort-Versions-1.620.0.ebuild
+++ b/dev-perl/Sort-Versions/Sort-Versions-1.620.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A perl 5 module for sorting of revision-like numbers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Sub-Delete/Manifest b/dev-perl/Sub-Delete/Manifest
index 562284c76e09..10417c5c5eeb 100644
--- a/dev-perl/Sub-Delete/Manifest
+++ b/dev-perl/Sub-Delete/Manifest
@@ -1,3 +1,3 @@
 DIST Sub-Delete-1.00002.tar.gz 31437 BLAKE2B 4c622824c8e41f2c7eea6192799c6300fedc9b73a20ba1a40efe71b91effcb861884c8e38ca5e0001d4bcd5f77d6dca39d1167f1ed4aa18d78edb41486c35fba SHA512 41a926099634e24d805756123be6ed7153568b45acc061fa5b3d91141eea6a1c6109681a725f4351bcbe6ef320210d2f18800b7da7e9631574f535979ff22e06
-EBUILD Sub-Delete-1.0.20.ebuild 370 BLAKE2B 4b463c618ae477c67ef2c7a8400b64fb15b3dd487c6d42f43754ee5f62c9e44cb1bd5f619aa188478b102867f6a78aede3188b37e2facd1d90968f23401a7d49 SHA512 536762090a8f6fd9d44cfc915b9e0a4bcc2f73c338c81fb0ab3f452c20ff75042f3f7d506bdc678192859f8e639dbf6f913054d6fd1523dbd7844f29c09f8275
+EBUILD Sub-Delete-1.0.20.ebuild 381 BLAKE2B 2802a554421576b52a3cfa4a3a59a6989965fa798fee8c57a2520fa8f7739e2f50ead67e72bc190a99c08a9528f185ef0a3b9ecd1a5920ce57b79d10946e2f9c SHA512 7214e6d7b51d38af2a7d0c0461d2bacde913470ea81e73094580efb308dc4236f7c6108504ca2774045875756f4284a69410cacfe7147e42d8e01c52e08a8d52
 MISC metadata.xml 392 BLAKE2B 651fdbb50c16881b92c7be9aced7bfca7b854d48c133d02702e55845be4c9ebb1129d9cc551d1df43f40fd4c651454c88aa2b1b5bdf1721b7d2e1a3eee94c631 SHA512 d39d1a5cb8e8927e67332b62ef210c48627c3161bb479e4a49822ecde4e397ad78aae916c583018c585d0c337adc1e5def689fb9a78991c3a034576a8dd11ebb
diff --git a/dev-perl/Sub-Delete/Sub-Delete-1.0.20.ebuild b/dev-perl/Sub-Delete/Sub-Delete-1.0.20.ebuild
index 9880f2d45021..a3565374005c 100644
--- a/dev-perl/Sub-Delete/Sub-Delete-1.0.20.ebuild
+++ b/dev-perl/Sub-Delete/Sub-Delete-1.0.20.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl module enabling one to delete subroutines"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~riscv ~x86 ~x64-macos"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Test-File/Manifest b/dev-perl/Test-File/Manifest
index aaeadafb32e4..7c832fe438f1 100644
--- a/dev-perl/Test-File/Manifest
+++ b/dev-perl/Test-File/Manifest
@@ -1,3 +1,3 @@
 DIST Test-File-1.443.tar.gz 27065 BLAKE2B 0f1568dbb27aa2aaffd13cc1d8327260e4bfa03fea01a80a810c0c10fdb1a18b3ba6fb5c50212d8956fa14dd0114438dfc7c3523495a20f8f35fdd13734a87c5 SHA512 9ad66b3a9dc1c3752a4ec22934db9139ac010ac3237a3de018d4ec4a65ac047f0152ab9e7979a2615412c1af02a1f2dfa0dbfdf5eba5358628b1b443232c45b2
-EBUILD Test-File-1.443.0.ebuild 693 BLAKE2B e6b17c2558a574bc4a50cd315ac34554abccd10c5824e38274e12f6ba7dbf40a893eb5f0595fdf13e0ea2e96d6ea3303dcb4925338ffe0254fdfc1ce37718112 SHA512 797a5139ba696cd13e33526a3c250f977fbb31d1cc7cb8f62a38a904f4f2dce6f69f6ac05d96a5b01d4bb124f9ffecffac0c5db344a978383a79fd834e201d26
+EBUILD Test-File-1.443.0.ebuild 704 BLAKE2B 2b385edbaf87ce1c03a3d092bf9cd4f9e0df8434a72c2742bce415153e84e35837c3c101f445d5bc66100e508495ee065c55bf2632d691a6226dff9eee265f97 SHA512 bd7bb3d144ada349641c4fd1b0beebbd1edb27fc9d7c4766c780682728f942e38f8b86382d42e3ba376a627787434d2e3e5db6f677d87c9dec06f5e2e89f762f
 MISC metadata.xml 390 BLAKE2B 515dde783fa52220e00b4f58cc9dde38d80b6eed484bfb0bdcdf89f7daa62246f76dbc7bee8610b067f743af4ce9698ccc75c7d85546ca1f6f7f96d97378085a SHA512 93e9377cbec8728c2ff3c879a306c89e52db8af41443138c8f68fa4100a2965af2b97afab9426f4f64ddba7d88e52a123dec6976a253f7b47257172bf3140677
diff --git a/dev-perl/Test-File/Test-File-1.443.0.ebuild b/dev-perl/Test-File/Test-File-1.443.0.ebuild
index f9a62e4aaa19..a706cb1d3cad 100644
--- a/dev-perl/Test-File/Test-File-1.443.0.ebuild
+++ b/dev-perl/Test-File/Test-File-1.443.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test file attributes"
 
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Test-Kit/Manifest b/dev-perl/Test-Kit/Manifest
index ad020adb8301..94f31aaaa7ed 100644
--- a/dev-perl/Test-Kit/Manifest
+++ b/dev-perl/Test-Kit/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Kit-2.15.tar.gz 18087 BLAKE2B d3175b5d9be51feb128ab57321d800caac9ccdba7ad7b5d7457552514143979c936e2cb9f7025ac75d1b01a2f80e34016c1d7fdb3f47d5781b002651e2c2c0d0 SHA512 ef798307e44c214f3b312b1bde3b48a39948c72c683a17b0e0ab7b097cbc991408a6382d06a94bbfa8cd0e6d92a4ba5339245463c249660f987dd8a5aef4691e
-EBUILD Test-Kit-2.150.0.ebuild 772 BLAKE2B d28cdd906bb9e24079af82ebac40de43c6b049717fe6f09a095982dcad48dd6285c125e59cf37159016bef1f440ed7c76dcdc54ec002b97f1791f5ce4e65c6ae SHA512 43e8701567ba30bd34cadd7613821f0f00ebed0cc6ec052b6d85343d684dd0dea75b28c3ec0284557949905db7270f3a21ea62d93f9fb9772a746b4670f5a75e
+EBUILD Test-Kit-2.150.0.ebuild 783 BLAKE2B 5ce70975ac9dabc809998eb0c72fccbd9f15d77b04fe6af64dfba3a2d00fd6025b9bf43ba179a6a29ea479c57b63be91f4fcec39ba1e1ed31c9f2815ae1224f4 SHA512 e753747dd384a2f97abc66ef6d1e2e1fb94fe2389cf5aa9661f24317ce7a0745aff6319c25275b6ad54b81143a290d1ec9118bc03c4961741cccf7ed8effe532
 MISC metadata.xml 388 BLAKE2B 82afa5e0509c2bd5b72126264365bcd57aa9a52e70749500ee54f43744b9970739ccf73802ae1813b2e3ac3853a15d4981360a0ae51f921d649b4788c989b04d SHA512 df0e66972a9ac18aa6bf07996bfa41a81e9627e40b1a8a7b0c611a75e9c52ac0757d2cbc35d085d046de48db3d515c0e9eb6c647695bc8d1a8d6398aa3f11693
diff --git a/dev-perl/Test-Kit/Test-Kit-2.150.0.ebuild b/dev-perl/Test-Kit/Test-Kit-2.150.0.ebuild
index 010d55fa3f64..eeeb0e1c91b7 100644
--- a/dev-perl/Test-Kit/Test-Kit-2.150.0.ebuild
+++ b/dev-perl/Test-Kit/Test-Kit-2.150.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Build custom test packages with only the features you want"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~riscv ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
diff --git a/dev-perl/Test-utf8/Manifest b/dev-perl/Test-utf8/Manifest
index 0156343f7881..6e0767258e91 100644
--- a/dev-perl/Test-utf8/Manifest
+++ b/dev-perl/Test-utf8/Manifest
@@ -1,3 +1,3 @@
 DIST Test-utf8-1.01.tar.gz 33308 BLAKE2B f6681d50e55e56e29cc9db7b724e5545f916b822cb510a066a4adf2da83a671ac499ea119cad56446c4ba4a3a0257a51f39ad8267efc893d9983c81fb50fc894 SHA512 07dcd5ed98a63f7d96bb0fc629b168773d02bb4c93c5bc44ec60738fc29669794547dfde5913f9de682cd583cf85f4d82b6151398aaebcfec9278525447b9c4e
-EBUILD Test-utf8-1.10.0.ebuild 568 BLAKE2B 23a9fd9f025ac0784ccd1f6f72a14e77e81efeb10da071775d6a12a6e7ff4a8ae68954ec7ff15d7257e2ec0c722201794e900ea4678757f23792115109819bee SHA512 ac47b6178697a49f428cd9532857f3bffd389d665437c224cb87772c5f44cbdaa02bfd1f9e7ef6ac13f1e6700d06a9d39d4ecf1f05e3aaa9a7db617b567d46b2
+EBUILD Test-utf8-1.10.0.ebuild 579 BLAKE2B 1cdcd9c202f8958e76bea74b1e53d08cf244ae46fd84688c29488e843d936b5cf875cbb33d1a35ef3bb07db2923b68c4a6e88e9c112557ebb223328bf025f302 SHA512 2d8696ac1b22f22ab4d05c4b14be0de51c84729a0a1763b7013944f9ab183494a818bc2a1fab8e537065637d830304b64fb35c11d1fd1d9736ee97cc8ee20b46
 MISC metadata.xml 390 BLAKE2B c83ef0105dbc22593183aa9647f03a3005a894f7e3756d2b158280beada2f693ba91f7deee4ae7f1c7f4cd9db3c0eb5ee314d64330dd15a1ef7560a10f97ff2e SHA512 8766197bebb4765d647745c4e1db2e3f02a7a3a5bbd337387e7f8e5ff8b83b4bde724c3b521787e18979f6b0a708e7f7b1655e3ef60f4b74e892bb8de8b3ec5a
diff --git a/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild b/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
index 5ea37d8d1b9e..602385db5c06 100644
--- a/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
+++ b/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Handy utf8 tests"
 
 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 ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Time-Duration/Manifest b/dev-perl/Time-Duration/Manifest
index 3b69fcfb1ba4..fe4bc0048fdb 100644
--- a/dev-perl/Time-Duration/Manifest
+++ b/dev-perl/Time-Duration/Manifest
@@ -1,3 +1,3 @@
 DIST Time-Duration-1.20.tar.gz 15478 BLAKE2B f269d9667482712b952f5c29bc041efb9a85c0c8f93bb0ea6f0ab3cd0ced1259b41cfaaaad34146720b39863e3185c0d1f99fc3f0efe91f2a6e8db36d42ea390 SHA512 74bdcbc2b65061ad30540a95467de24f552235cea2367a7770309d9ffefeb35717f438e4f7ebf6a1d63f338cd714ffe16b3f45808514995db9753d643892d5f9
-EBUILD Time-Duration-1.200.0.ebuild 573 BLAKE2B 4d7d226e44ff3b7e3bdee724c0be40e1a010e22905c9b1685ca82c99eb79d0a117ee6b045d77356089b72dfea437d3518eb1dae23cd731068b5d8459ee3bed86 SHA512 6b078aa26e2b58f9d9270140983a478ac2a247866d39e6417ad86649a36b025054fa0437f1237c1f0d52766ccd2ea04af2bf17d508cc86f45d53c2c6262867b5
+EBUILD Time-Duration-1.200.0.ebuild 584 BLAKE2B ce176dc2b96294fa246c19954b5cb29daeb6326a2e5a65e5ff538cc578d9db39013e67a8bb4bae1e971e8de0d186d96ba7a15ca317d959f72b2d1d818a79d175 SHA512 8fd4bba17053b78ccee03dc1d613e50b78fc2effe7a8f87c5b22a2684b05b53d276b2a608438d7634143448e9144a6b5870937a5a75077d7b307f04c2c2cae43
 MISC metadata.xml 398 BLAKE2B b2355ddcf44390ccbf80d078a43f399b7b581d7c315b096a97f9b6630bd8b4a4978111b01101c4f5c83260462d1fad835b185dcbee4ef106c7a54074993fc556 SHA512 d5e236b5e72e78eead20d8be89c8ef1340b9d250ff33ca6f200f7bd5370c2131d8eca112e932726c4650fa9c5aa48709e4da3884839dd14c6bd845bb7afa5622
diff --git a/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild b/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
index f7cce357b776..d5632bc55772 100644
--- a/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
+++ b/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Rounded or exact English expression of durations"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-LibXML/Manifest b/dev-perl/XML-LibXML/Manifest
index 58e477689261..b0b820ef3105 100644
--- a/dev-perl/XML-LibXML/Manifest
+++ b/dev-perl/XML-LibXML/Manifest
@@ -2,5 +2,5 @@ AUX XML-LibXML-2.12.800-disable-expanding.patch 2608 BLAKE2B b21eef9abb75a885c89
 DIST XML-LibXML-2.0132.tar.gz 469983 BLAKE2B 66002c35adc1156af76f16af2a1b4617ef25470cb434ee73dd9242fdc37a20d5d417ce5003ca202f69de08e053705129c083e65d483ae7e85375ae2ad6cbedc5 SHA512 3df1cb67ea955133492f2b6f8def2b28079c59e99170a31820aca69ea81686c4b67171509f1b311faab9389d200c4a24942b3950d7c0730ff1233a009b398fce
 DIST XML-LibXML-2.0201.tar.gz 462237 BLAKE2B 17313daca3e87b12f0d3161f628dbd5ee3fbd233747a9602b275e13f14e9710eba424804b1f57b40c2f0f340d1c29ca0518ffc395b808b0e9851c61943d73b22 SHA512 988bc98e7f3e426202b9770ef055df68abc861b935dcdd8ecbefaaa7cd528abc35cce9bd75f2f10412917178f6b74ac6bf953feac130b1f9afe9e18c16139e47
 EBUILD XML-LibXML-2.13.200.ebuild 1566 BLAKE2B e3064dc3c42ec3c8bba51cf2db8a4fb74253c146965295d44a346f284875e23048605b827b25754c33b474f446d270d297a6ed904f0516771a3a5ece1f612861 SHA512 7890e8597f816ce4804e9fde3fa6f406ff1dc3a801d367eab121c17fe96ac5f2e0353e12d38c9b0700182c59d6f3523ff573b2d8ba1c70190ffaae4fb0237f2d
-EBUILD XML-LibXML-2.20.100.ebuild 1751 BLAKE2B 6ecd0cdf94d5dd944f35f1eceede7b4041c9ea2595fcba15e1f0d321378a848cf27c06beb34295654bcac5d5dcc49612b268799546d80c7673ab53ed98e958e1 SHA512 a984b10d50676836bc5c92232841c20e5159f326ccb58246077ca78abce0b35fc9cb8558303bca051d644251d782872e24baf25943a76a32c487247f4007e7ab
+EBUILD XML-LibXML-2.20.100.ebuild 1762 BLAKE2B 3a2344cf924255cb4e57bc6f10bd8d9199fcf0a1f32174918a100ba20fc2c14d9bf4a2b86e719c1a18caea5f6f2dcbb38e05c048a04edfb01600e5fbaa06d1b6 SHA512 c3dd5f9a4f61630c3af87dd022fa8a1dee37d764328785ccada8c4279a34977bba0be4e59add2fcd8b95e50408af037853b96170121c58cd1ac5759b0958be65
 MISC metadata.xml 2782 BLAKE2B dd55f05f6dbaff2e8dad45ddc451309ef16896f9e4a8c60e89c8c6b8fc854654cd69363870cb4f6feabfef5c095656fab06e6ba48a9a9c31058d462e15870534 SHA512 6353b4890d24a2ab018caa0994913a4dd6b7dd753e089f9fb0570762f75517bc8ae4e8ed3a8990ae2c75957aec0791561f00a991f1e3976c225781317fdd82dc
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
index e8fe34b25731..34f5d221eb2e 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl binding for libxml2"
 
 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 ~x64-macos"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4a14371d77d5..8b8902160bba 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index dadaf08d576d..5e140a889b85 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,7 +1,3 @@
-DIST sip-4.19.22.tar.gz 1050805 BLAKE2B 7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc SHA512 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
-DIST sip-4.19.23.tar.gz 1053640 BLAKE2B 316c972a5cf7dd6464a418702e7d91192202330cf89a78d6ef480034ac8fc2f3f4cfedb85e6bc7d3d018bfe3d29ea767133db008dbfa521312e3aea2b96cff74 SHA512 a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1
 DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
-EBUILD PyQt5-sip-4.19.22-r1.ebuild 2053 BLAKE2B 0925192dce6fab7d8106f83ec522c8f1a9828f5a4a8a654370adf75e82c427453a3345ec9c6f005b5dc861c5b60a92c909077624a87a455839e5db5b13fbf6bd SHA512 d12679262992b88569f41a66b1df7c38c4330f0fde21fdf874081066459581131ac6ddd883473268cf797502f36a7f4f14bfe870abc042d61cc1450cb9099db4
-EBUILD PyQt5-sip-4.19.23-r1.ebuild 2057 BLAKE2B 11461c7345631242eabc7a8f234cfcf6effefb678d7104278e8b13ef194bcb85522121e19ffae23c980a6ecf0bf7de1593fcccda00c8ff67e548e6d7c4fea32c SHA512 e846c688c4732add0fed0bb4b971c880becbcea2728e4a510f9d7dc6de906a0ca743405a060866c56b6f0ac2d04e9a089b7ec17419a16600f366a14b38775c3d
 EBUILD PyQt5-sip-4.19.24.ebuild 2050 BLAKE2B 67dea5878ed4c64b5dc50558cee40fa5e48175cee88293b95c45016d892d1ed645573012da431ccee251903d1b574823490b21f2931e8f5b59cb91e078c1231f SHA512 efdd46c1767c410b44153883aa64b9bfdb10b29642898aaddb9142be3ffe3ec034d6383827c11dab7c016bdea09f4a8628d11a83385f8f7bda3f2d6909feeefb
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
deleted file mode 100644
index 9313ec901ef5..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Private sip module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${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
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!<dev-python/PyQt5-5.12.2
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sip-module PyQt5.sip
-			--sysroot="${ESYSROOT}/usr"
-			--no-tools
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
deleted file mode 100644
index c61529a6f32a..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Private sip module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${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
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!<dev-python/PyQt5-5.12.2
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sip-module PyQt5.sip
-			--sysroot="${ESYSROOT}/usr"
-			--no-tools
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index b12e097fecca..634b94810d1c 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,7 +1,3 @@
-DIST PyQt5-5.14.2.tar.gz 3246557 BLAKE2B 0dd57da76dede97349c1af1d97cebad430dd5ae03c99b71de2e1ef1c41c1503820b0c0b1af8ddb507ffa5d6f466f7d3012db2cf625dad949dc4c962fb9e8a6a3 SHA512 56d9b2970ff50f2af0bfd889ad1226bf64087a6210cc545c5a0188352d1651343fcda9d53f04b041273f61bf31baf43af4a1854c1b580d50c28cff82f59c24ec
-DIST PyQt5-5.15.0.tar.gz 3262004 BLAKE2B 6f9751bb00a8099555da89cc0df26d36906fabaf12eba60d11479152ad78805ba84d6de9c32b6212a19edb38b10c2253976a964bdcfaf18b8b8aa3656126b73f SHA512 35bcfef4d7ccfee04c1c4409d2af3d862f1e8e46d6ce743bfcfbaf43d2046bc58317824b0840f3db460ad280d1b7e896812268b36225198e916a1d9ea86823a9
 DIST PyQt5-5.15.1.tar.gz 3264559 BLAKE2B 20060297c52aa5d07ba28b50440bd3623b8648eef8502693f8175af9ba4edf9238b9be71c696ea2589556ad70e70e868dc9c286466af22867ab51d5c66e613db SHA512 a7378dd53337c58f5ba7e9f7510b57fe4affe578b68975ce1dd7ba5c2a1c77d08d51d11078ce782aab09509df934eb3e4d0588de87391f74ad99f9624644cc4e
-EBUILD PyQt5-5.14.2-r1.ebuild 5728 BLAKE2B be7eb17461a7de96db7093a308760f5bc8e7291cf33c85a3ec23cd587c06448d27b83d91c2359ef6bd5f2fd0fa07ac8839e79bb378e9314ad14e20c08ae79ce4 SHA512 6a29fbc177ee262d0f5551b3246d2512f6f2ec0b47db991a0885372c5c0afa5ce8a4d3e712791746894b90a334ce5bc33649b6a290ebb2d9c7a96adfc77c6c85
-EBUILD PyQt5-5.15.0-r1.ebuild 5740 BLAKE2B ef0da446f5bcc809cd0bb1c1d194a6183cc0dba0ddeee12658995d127542377d19bb75c46a4fbfa9353f8462b4f74cca16b81e5bed03bd1aac2dbaa5f8ddf461 SHA512 2d077f9eb58f623f835cdf0d13a8b5686037a553e4bad4ad7a14771fa58e0234f9ed9fecc580b43d98430f09afe101431e3b1098467960e6cf73df19740bb107
-EBUILD PyQt5-5.15.1.ebuild 5646 BLAKE2B 93def41e258186e74275a5d720f5e839feecd4e11bda1a32ce6be76f5f14fade1d1c3f3b9d6dda0f621e9fcf17993172618a82a0aa1ffef415ffe7533f28c859 SHA512 7b4653feb002750defccb57e9e7fae77b520031f00350b42febdf2e5330c75569de8058975b7a96af99ec20a6c97658efc5574057c9b073b3576fa691e3fd11e
+EBUILD PyQt5-5.15.1.ebuild 5645 BLAKE2B e4d0ea23235af95deb7532aaf613bbf2b23fbc032eb5fc26be89cda774774b552d7ed4a83329fb9b162eb9d1d6f9d4be7d7b00d67e0094a780c1a851e116180a SHA512 69dfc5e0d4a9c975a062a5deb20a7f48e18e56b42f137ff56544d3e6d610495a011d15a6eb231d9938892f4ebb15375b3a20452caed63d35ec5ed1a388fd62b3
 MISC metadata.xml 2354 BLAKE2B 765b65d4070c72689637e5f9cc2f5499ee4b8fa622ce75fc87a873e9b69079dc83474ce03a79b4c77ed6cf9c46881e0d1d629d518b6d14849b9ce5f72eafff04 SHA512 21444cee42058a0b134c27c67ab8219dcc96c5898de4112e8cd125a46e61ec7f421a2f58677991bc3bb2c330e55fe2382b561ead1a6623d549210e7ddf06b6ec
diff --git a/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
deleted file mode 100644
index 6f47872f089c..000000000000
--- a/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-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}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-# TODO: QtNfc, QtRemoteObjects
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
-	multimedia network networkauth opengl positioning printsupport sensors serialport
-	sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	networkauth? ( network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.12:5"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${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} )
-	webkit? ( dev-qt/qtwebkit:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.20[${PYTHON_USEDEP}]
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable networkauth QtNetworkAuth)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(usex ssl '' '--disable-feature=PyQt_SSL')
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
-			${PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D}/${PN}_tmp_root
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		rm -r "${uic_dir}"/port_v2 || die
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
deleted file mode 100644
index 075b00012939..000000000000
--- a/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-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}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-# TODO: QtNfc, QtQuick3D, QtRemoteObjects
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
-	multimedia network networkauth opengl positioning printsupport sensors serialport
-	sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	networkauth? ( network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.12:5"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${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} )
-	webkit? ( dev-qt/qtwebkit:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.23[${PYTHON_USEDEP}]
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable networkauth QtNetworkAuth)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(usex ssl '' '--disable-feature=PyQt_SSL')
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
-			${PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D}/${PN}_tmp_root
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		rm -r "${uic_dir}"/port_v2 || die
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.15.1.ebuild b/dev-python/PyQt5/PyQt5-5.15.1.ebuild
index fcb8d3f4ecf5..beba8e89735e 100644
--- a/dev-python/PyQt5/PyQt5-5.15.1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects, QtTextToSpeech
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index baa59b975d63..31008acf1db3 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,7 +1,3 @@
-DIST PyQtWebEngine-5.14.0.tar.gz 47794 BLAKE2B 28f4a577ab5d8c1bea439b11e836008d27b4a49f31f230885013b515147a95c97e398328d1fc3a99619c3fd6eca3da7e94bf5873de9ac6511e0f59e467d4490c SHA512 c5274ce5ba1c80c6851971c3e18acf33121cd5863f613bd1789fdb40323b52429b55b54f3dcbb3127c85343e11f14c004ad54711b2b59cab95fd440f90fe5f2e
-DIST PyQtWebEngine-5.15.1.dev2006110847.tar.gz 48514 BLAKE2B a4c4490720dcc1bf95c62e3bb9e72f2e25000a2641b64f2a0466649899f56eac0594461471ba787c332a32cda8b48cff0bddd2d4beceadfca02b1c06668e4117 SHA512 1f39052f22598f4fdb30ce9b9180fc145414e2e6708f2bda5a6f9166824926f91ca61070e64c4d9f880f0711a0c4c3a6a345d9904092bb13d51bd28e71fd52ab
 DIST PyQtWebEngine-5.15.1.tar.gz 48520 BLAKE2B d4e4fcfb1066fcc274f4b3c8ccd7380435b9391586e3396fb5aa95ad7443c168ea9be3b85ec93e2dc28285aca18718afeb1487cb2c4ad5ed1a4f4d03010107ec SHA512 1efbea43bfd4a6de1c7aa2ab2ca124c4278b6b7ea0d6073c64a7ad83df676759d0747421cae5214017e3c61d8edddf9766f93660e13eee5d407a24fd11d8c21f
-EBUILD PyQtWebEngine-5.14.0.ebuild 1666 BLAKE2B 50ceeff152ddfc9bd8809eadf514ed5be1363829d7533d4431f7ee5d23a6d3d172dd96303912dd05770391b633774c2931e11ecf9a1eb9cb5b10294f25a557a7 SHA512 ac328a51e306f15d4fea2101968dab5df731935642938915bc62399ce9eacc1a79bb5666af51594db0d37efc1ec9efdcc6d4168e44eb7c6d9a6e54515ec4c0a8
-EBUILD PyQtWebEngine-5.15.1.ebuild 1666 BLAKE2B 67519b9f2008f33f6113279c461f098bb7f9412f488ae84aa48503a2386cb728eedf4f741da21fb008dc904961e0842ce8b8462b29dbb536663bbbd2723eb6b5 SHA512 a18072e201819904e77ee69f54c02eb3cbdab23dea970ae9c673354e2e90afe8b6370b86ce45c46fbaaa59de5de67694a1d429a5667e82805fa61a9c5ccccb2f
-EBUILD PyQtWebEngine-5.15.1_pre2006110847.ebuild 1668 BLAKE2B 18ba0ce56d43189b91d8d38109d8c55e43ebfad7bd037d48dbce6bbfa255b51b209fb9c519b9002e55ce25d6b0a88dc7a04f6ee9dea6a013d177ca777b2bd7ea SHA512 f1679dc7da76d09e86151674c35744388dd3bd0cfd38c279a0f04c932b03288a6be9fc8d937b22a051a8569ac7f351e1914e9683ef0481bd2d82f86d76ee784d
+EBUILD PyQtWebEngine-5.15.1.ebuild 1665 BLAKE2B 09615c6e5e816dab50b4726d03efdcf4d62ad9dc2b550521e4120188edf9fa0939fcdf7eb9d04ba7015f114e23c49a4ccc8f64bf259bb9a3553930e667aa8775 SHA512 a643e883aeeff05cf7a42a2d5e506fdc62e755d7458bb7a82080bd9412f82ea7862cad03d556150167abfd2a9a72c3014a434763090a6caec80122da8f8ad5ed
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
deleted file mode 100644
index 0f869cca5363..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-
-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}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="debug"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-	~dev-python/sip-4.19.22[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
-			${PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild
index dae619376ad9..c8a9d0e57828 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
deleted file mode 100644
index 94183f43f9bb..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-
-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}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
-			${PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 34d9faf75add..8d12113d0cda 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -3,7 +3,7 @@ DIST aiohttp-3.7.1.tar.gz 1111777 BLAKE2B 03d16e8c9d64ec407cf7b6dbbf5547a88f528a
 DIST aiohttp-3.7.2.tar.gz 1111049 BLAKE2B faffc582f2c72ff892862b5b782da75b381e59b21b284b1120e4edb16f22b760f8cabe56261061e0049a5dfd041456076e294e942a02309e9b3d6b414facb0cb SHA512 2dd4f0264f1fb0801be366c269b73dd80b542e8e5bfe18a01fbdfadd0210022ccd6e3975be1be416551ccce82f42881e18735d5c6fc68a42b7452ab18e157dc5
 DIST aiohttp-3.7.3.tar.gz 1113127 BLAKE2B 47d95565db1184c6b55a1e7d7a6df8cda872e4fe621f653e3143608f51dde2c7d30d00835da357dd7ae33f4858ad5778074dfde5261331a3539a5d6776ea1a25 SHA512 d1dbbe3cbdeb1a460f5030a08a251a7bb7ae7ec038ca93ba5187b2da1fe21b80ed6513db647ef382d2d92a3d527a34dffbd37f51aa1e8b65bb36d517304b1812
 EBUILD aiohttp-3.6.2-r1.ebuild 6857 BLAKE2B 733c733bbdf573fd4bfc1c9fcc44b4224f5913ee886abbf1908f3ffb258fe611babb6c46cc5ace49996875140cab24286e79e961f17b1af00093862d6a37f4bf SHA512 ecef2bd9d04e3d6dcb626effce1a895da5d5cb6354d522305484f4c33f4298bcabc7b0a08cda9e3dc89545c2405a021351e62c71f755c937123d345b8b7b4f5c
-EBUILD aiohttp-3.7.1-r1.ebuild 2480 BLAKE2B e82b120d289b790bd8f21a1afc3d86bd870ef7564a5e62708e4ab1381dd4d5a9bed8cdc785b2a571a54902795985edeae80a03fecb98521585242fd5c0fa237f SHA512 33aaaa609506161bc42c8a63e3239e791cef3578cb3a85586cf65c74e47243e476d230b82b048315e8d8b1b464d56beee91f3cbaa9f2bd34f4a56b0f44dc5051
+EBUILD aiohttp-3.7.1-r1.ebuild 2478 BLAKE2B 0339ed229fe35e8f3dba5c0f3fcbcf37b657148091e530f5e6ce08f9e76216fa64df8297b9ca6687d81b80279adb747967013361b423b9c27f2cae6946e7a6b2 SHA512 6ce5bbc7f2b0eaff6e87190c4ebc1322ec62f7151393ffbf41f23b88de297952826d010f9da0d02ee213f6d17b21a4e802fbbed92fa68db977f3878a8682f6ff
 EBUILD aiohttp-3.7.2-r1.ebuild 2506 BLAKE2B eed6db56a3d93185ca0018ae4337841dd20e9d90cada19bdab7c0a7575eb1f124ec4457546c13a83886f918c37f0b056d9a3363e2b4768aa8ec0ccab8822132e SHA512 3aaf70bb8ae5d84f3e387879b590ff830df5c3db952664d32cacdb92908afd96efce76103bb74af57baf4f9c68b0217202a02fc84785e152eefbefdbef6d4889
 EBUILD aiohttp-3.7.3.ebuild 2506 BLAKE2B eed6db56a3d93185ca0018ae4337841dd20e9d90cada19bdab7c0a7575eb1f124ec4457546c13a83886f918c37f0b056d9a3363e2b4768aa8ec0ccab8822132e SHA512 3aaf70bb8ae5d84f3e387879b590ff830df5c3db952664d32cacdb92908afd96efce76103bb74af57baf4f9c68b0217202a02fc84785e152eefbefdbef6d4889
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
index 8602857b1d06..2f981beb814e 100644
--- a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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"
 
 RDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index b132e6879da8..17ef48fd7459 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 695 BLAKE2B 340ee5db42e29684bc436cc804eb70b00bf8412d87eea33b96e701ac042278f382a03e8b611a204f5d14a9d0919c08885e798df5258f285cfd5f080e043b4d9b SHA512 a56520e124ca655258a7410c66772fce54e1af4c96b15c9e4ef0d52ec7b23e5f7ef294888e4097f7f9a89ef3f594a460dc7d6312d47738fd6a8f9f051bb9b685
-MISC metadata.xml 442 BLAKE2B 93ff73ecbd80ae38cb18b2ffe11bb60c411b7f3ce36b196566e230fecda350a13d19892e672a65fd278038feb53273b39ed7eb42809bd397bb71b8eeb4baf5ca SHA512 fdd4036bac7d48e387e8ad059be940d3eb3cebcf1d6a6079cf4effe25265c3a52d360269fccd8e45f67374d2ce4c2b67245e75fd59656df92a36744265494f07
+EBUILD async_generator-1.10.ebuild 706 BLAKE2B 426fec76b5d43fba969483b484fd776d9d07bc277857cc88081173039f446ff4e6d3df6c92d0f9cf25755ae2e30324fc010bd4625ea04ffc03ab9845114ebb73 SHA512 4ecc6e084c678a2848f8878de442893f79b363d86d7c49bbd7af65d72549f56859f9fe7b5257814e4bcbc6d729985053dc8c523fb50aec1187af9738f4a112ba
+MISC metadata.xml 466 BLAKE2B 475eccc2804c48f77acafcc3359a2d5c377cbcb79dd2ce1b083c2e2e55931738cf1eca46bb9d2b7172df435f9bcba6418b80c48836bfb7d8298f868639df5eaf SHA512 3d89946502cb479a68d77b5e08cc31171cf05891391833ddd986c70691f2d33cf3b480d290f90a58ffab53a9bc882af2adaaeb8f9cff53038a21f421ba7c2507
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index 0f69cb5d8b09..ef5ca4c835f5 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 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 ~x64-macos"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/async_generator/metadata.xml b/dev-python/async_generator/metadata.xml
index 2b736def6706..6aa517a4e33d 100644
--- a/dev-python/async_generator/metadata.xml
+++ b/dev-python/async_generator/metadata.xml
@@ -7,6 +7,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">python-trio/async_generator</remote-id>
 		<remote-id type="pypi">async_generator</remote-id>
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index d3a24d7bfbf1..3a2d330c347d 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,3 +1,3 @@
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-3.0.1.ebuild 1012 BLAKE2B b8bc1ccf180e171142e462a3fa2e15b385bc97b19797097c78c11c6ad6a967e8b52c305a551319c48b6bcdb4f2855ad9754951e96407eaaf6d72e99b1e1c67be SHA512 4c16cc17eff6a8abf4edb563551cfbb340f282132c86110641824f0eb0cf71f5e506c231f32e30246fdb834370dcf7152e418ec841f2540864844179efb1d2d4
-MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
+EBUILD async_timeout-3.0.1.ebuild 1023 BLAKE2B 61d94a0ef6b0a4f5d68fc66471f5655d36b33c642145eb1d83f63326f6a76feca1c33dde36fe8ed25dbc43fda7559c4874879e55a025cba8b9eb66de7d973a62 SHA512 d27ac6bf97a3061cdcf5b33e276b684cc933b9712130ce8c3ec348335557d5ad34e3bf7466444a660bef329daed771136ca76a5017e93d81ddfbdb3aca1666ab
+MISC metadata.xml 459 BLAKE2B 60ae5fe574af7abad31711e3950b593a06080489f447c53e4c40166f9fa89b19f81ac3519b9b1e4daaec9f783f9ea85aaa387903faba4d007280666dfab4dd03 SHA512 df5c0e3ce5f4e10486a6aef2923d96caf13b28c8dd4b9c5a5c0f8abd23ff8347d15b3fe9b89d7793a6bda297fc9b99ed63b12daa19442270f8a7dd95903c55ac
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index b6b0dc7c171d..f0b58a1475f4 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/async_timeout/metadata.xml b/dev-python/async_timeout/metadata.xml
index 897d9765df48..50d0852ebd22 100644
--- a/dev-python/async_timeout/metadata.xml
+++ b/dev-python/async_timeout/metadata.xml
@@ -7,6 +7,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">async_timeout</remote-id>
 		<remote-id type="github">aio-libs/async_timeout</remote-id>
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 76389dc2957d..28d296b2dd6d 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -3,5 +3,5 @@ DIST attrs-20.2.0.tar.gz 160604 BLAKE2B 1536366a943aa2d0517e3c0aa71230c378b20e73
 DIST attrs-20.3.0.tar.gz 164523 BLAKE2B 66d2e038e485833f5033fbabe2ef9a6565e3f5f5e8530f2c70019e4f5bdfca51083ac6d0bbc9eb765f838070bc90e01db1c83ed6da113ced67300238e12b5f42 SHA512 640532c6b763fd96572e5d85e93c111bebc4c5e0ff9419fe92fb51280f03acb5f9f43339f57d30659e777d5578460675c60ec0a362f9ad433893e3624ce6a931
 EBUILD attrs-20.1.0-r1.ebuild 824 BLAKE2B 024e581795697e8095b830d8eb4eb7b8a68c2e9ff28e6f7397313886b26765c54a3c01c9b9d831e7252fb4f30fe7f97cc131ef4d45c7642666cc2b3fc1241cf9 SHA512 635e96242fe24eacea79ee7e04a0a3e7ac76a57f24e45846683ce8769a79bef8cea6db041507e86c3a5077c7abc4946d347fe0e16f02c83b958b2a68ba8e1907
 EBUILD attrs-20.2.0-r1.ebuild 833 BLAKE2B a138cb7f30f0dfcddb7d09abc4b4ba914f6d06e9bc7bd920b51639cf401079aee2b173c3e4e2c717c5046facaf59db2bc65c8a197857d1e7b02236165dfdd2cb SHA512 3b0ddceaadde450f4e9debf0162790d7447d74876eb816a718e933fe9274fa3e631da903aed5955bc11ea51fb6b2917d12745bfc87af7eab1e75a67c9772bf83
-EBUILD attrs-20.3.0.ebuild 833 BLAKE2B a138cb7f30f0dfcddb7d09abc4b4ba914f6d06e9bc7bd920b51639cf401079aee2b173c3e4e2c717c5046facaf59db2bc65c8a197857d1e7b02236165dfdd2cb SHA512 3b0ddceaadde450f4e9debf0162790d7447d74876eb816a718e933fe9274fa3e631da903aed5955bc11ea51fb6b2917d12745bfc87af7eab1e75a67c9772bf83
+EBUILD attrs-20.3.0.ebuild 844 BLAKE2B 8d89df599343176fcfb2b65c86ed6f56a6995431eae3e2472ce150c825e85749c9f26439f8317d592b5d6e9f00b65febb9a9dceae34325199bd835f68b71ad7c SHA512 99af5c4d0229d8cc358217b72356c84dce309312e96f45dbe0522649f44f8d1fd14e64ed7ab825a9438c8def1b7b76567f3234a41e69e90f0694d107ac3b43ee
 MISC metadata.xml 520 BLAKE2B faeb38666d6eedb08951c10cc1affa171731fd5ccdc4ca482946aa9e94b887d493a43282c6fc48835af03badaf59af17f912a8d3d1481297dd5596c4784b4951 SHA512 a12b5bb882626a823475b64cd56ede72349b38ad19b70696a83558553a26499a85371e0c2996274b98b0e076e00fc2041dbb0a9af485780c54a3d9a36d7cdfe5
diff --git a/dev-python/attrs/attrs-20.3.0.ebuild b/dev-python/attrs/attrs-20.3.0.ebuild
index 6e31251f8bf2..ff76ab4915e6 100644
--- a/dev-python/attrs/attrs-20.3.0.ebuild
+++ b/dev-python/attrs/attrs-20.3.0.ebuild
@@ -16,7 +16,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 ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 5f43467b5836..70b34ca1cb6e 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,5 +1,5 @@
 AUX automat-0.8.0-no-setup-py-m2r-import.patch 826 BLAKE2B 835956b8e3ab657d09d683a173c43626f0af59056ccd25e3a7bc9167da4d5d081e095e91e96ee943e7329d28c3a70b9e001e8977d64bb85581ef19f73a9ecf93 SHA512 b89fd865e8b95283efdc96614b1230d3e8e6d70cdb0ba07842cdf07e1a546a5a89b7c88a0cd774ec47148579981d41cd7261cdd7069e2736807b64422b3ca56f
 AUX test_visualize-twisted-import-errors.patch 1999 BLAKE2B e551520aeb24b3df293eeda358fa3b9b3e33934af54ff6a7a205a0e1b5b7e916e34f8c81c103fa0fee93a22e7d0bc6ca3f7b8a17dedadeaccb02131ac23f94e4 SHA512 67f14d0b64333b872c0057eba32f77132a4bbf61c8867ec475c87552b3b553162c3e2a668ffeda0c75d85906273d50e4d80231213a3f46d1855316bb229fb6cb
 DIST Automat-20.2.0.tar.gz 61679 BLAKE2B 9dfb93a0bf0a348d8f7de0796b3e5715947eb84cc0aa507a453f438d2027ae877280ed6d7896192cee46f31c7d1c0eb6cb3dee36e1f13a315071513920c5b6d0 SHA512 715cb5dc087288492e6465a29e7d8502a84fadf451bc3d29da86335ea1c20f8efd9549f0c1eaac8800559dd8001dd73736c3bfacdc6321c83a35d2288d69632c
-EBUILD automat-20.2.0.ebuild 1616 BLAKE2B 12cf87c83a0c55b4da6f673574e07e4788b204fbe5f10b21e0fadc876e7505b090baeaafaab2465a9aa8f828e67ae1af90df9de6241bad6c5efabb8ba576aef9 SHA512 92de5b231f12ffe22c6eb0fec653be3553e851c49c626c6028aaf490d8a2b7fd10d2e7b4bac1aa2c0650f15e3b54c13ab21e58bf0f81aea43bce037a2d8e90a0
+EBUILD automat-20.2.0.ebuild 1627 BLAKE2B b966200febf7c13902afd2b5331038317ea7847df0ef4ea47778be57ceed72cd22859c0acfe1f53b295c7412a2076ab556c433ef5d385bba50619d3c74dc1e4f SHA512 9d48404c873178110f6e2569534b638d537e0bd0e205344828a5491e9418aced2d39e39389b32cd3584baa08fb7c50f149fb09c585fde20106c695b6846d8a09
 MISC metadata.xml 669 BLAKE2B 22b4ba427dc89c8f651aa4f5d31dbde255937d32f3c3f15e1b5a44f13e574822523d6051b087066f18f22f15001629d6a012961be2603b16f561a567826c453c SHA512 a3683067d91582e4b0262a8d66fbb86d15fdff9093916d4298c9ca8f94a81db4357338be8a4f18513b0670e1f209f138bc28b8bf5df5e0b5ed4b0978dcaf6083
diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
index 2b8afa2515f3..29d14b887bce 100644
--- a/dev-python/automat/automat-20.2.0.ebuild
+++ b/dev-python/automat/automat-20.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index 2dd7fd511d3d..941672f81377 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,3 +1,3 @@
 DIST beautifulsoup4-4.9.3.tar.gz 376031 BLAKE2B fbe2139f288eee978c3f665c7640f66c6c51b857a186f6a8ace02b36effa1552f1cbea9e3744e0a46a65a06e6cdbd9203832e0ecd86b61406b933f9bd83d37b8 SHA512 e3cb6258bd7c51f12128fa8ee5948fb3566163ae233fac2dda21bab7772ab8dbb384d920b0ea138ef9921307b48f89cee3a9bf6111dfc8903d917ee7af365f34
-EBUILD beautifulsoup-4.9.3.ebuild 841 BLAKE2B bc8633cbc880ceb46085d837a95bda2b7bf3053b94c89cc7aa1bc68bf6250409c529182fbbc706de0cf35f15dbb416076c06eb4df5b4c4322facb8700973963d SHA512 2e9d1d6930df946f8c5bcdf3347ab284ee3206ca84659e81227aeed64f76e8bfdefb190f39679c24732548b8007999225c92afab6dea66ba97c251f73da87ee4
+EBUILD beautifulsoup-4.9.3.ebuild 852 BLAKE2B f2d1ce4fc1ebc8641f4d6f09005618c4705510b39443bc7539b7481a798a887865dea7e55dc037fd4fb8d2d6169350d23143639e4feceece6dfb0bf0de8319f5 SHA512 89d6ef3ee8641a857d7b55adc8ef62a82e2ff576271eb6db67b6b6480f7e5433b709abfbf158c2f43da4fd3576e7d82a02ca9ed6cb09b1e4610fd1941a9fdcb1
 MISC metadata.xml 744 BLAKE2B 93987e4adb8dc5dea9b897940cae80d431b29d693bd1fea9d242de75174b1fd86afaecc6a5fb5e4ad06576caa559a918d09da28d253147f2683703d911435f76 SHA512 f56ab7ff03d21187e38f292b24396eccfd53622c84f5f489bd1e515393dbf85b75bbdfe26a6875352b16dcbf16f89cd9a051dfe44dbca8786efecd7db914f789
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
index fb76be4baa6d..78b51572993f 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="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 ~x64-macos"
 
 RDEPEND="
 	dev-python/soupsieve[${PYTHON_USEDEP}]
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index f7c04e1bbb61..a6409b008c8e 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,4 +1,4 @@
 AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
-EBUILD betamax-0.8.1.ebuild 1099 BLAKE2B 9422f1e17d346823787931854ebfbd8ec0f242ac57ad333ae04896beae8afd93a90792c4019cf4de7453e581b2cffa277ba8eb92ace545903640fcdc14d9879d SHA512 a4718ad81c1c5b38b7b8e6bd4cf9cf626666eff11e21324bdb862923fb73dc848f326ad0c6728be590bc1cd28a1a3216628bdf8680a4ba699c35c42e8b03f233
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+EBUILD betamax-0.8.1.ebuild 1110 BLAKE2B 43eed0b3c65c9e15d3da038f06a03c73ba6c4b6032660897a916d37740a4f4801eeaaa191af0454d7f37cafb29a825099841579b8af331cd1bd1d53e2ee9f6a4 SHA512 b2d69230f289bb76077a6ca4bf2f504c19df7b517866fa50ac087155cf30e18ddcd5331fae06d996b6df9ffb1f58779662301c5bd447a25cb8f76023a9ae9992
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index 837b55db2073..1ec16e9e6c90 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/betamax/metadata.xml b/dev-python/betamax/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/betamax/metadata.xml
+++ b/dev-python/betamax/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 45b57ec3ed47..296141f66be7 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,4 +1,4 @@
 AUX black-20.8_beta1-setuptools_scm.patch 467 BLAKE2B 4dd16dde09bdb9c9b8480eff2542f11cbe712919dec6678193fae1dd2d58c646c76ecc4831a6bcbb54ed5a7f3692f61953bbb8856e8dcf6b64918ccbf32fe69c SHA512 47df09f60aae9ebbddfdf513d9b6caa30aaf60d65cd21027e965b0544085d63312dcbdc54906a0d1ef0edfaaf00f3cc753a7af3c113f4001ef4b48ca53e04c6d
 DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
-EBUILD black-20.8_beta1.ebuild 2232 BLAKE2B 1e6595c23dd7e632ef7a6815917b63a02a9b9cd218934564625d36bb6acd56829f9dc522cde2fcf6feb6ecc8abd0fa62821cf27e865227db5b6b8b929c49fd31 SHA512 2051d5941b7533262a886d467afe1f309f8f2f489955208fe6d999b25107cf56056f31420b3bcbc8560178410821c08c9652f495ac2b7ce07abfb81813083990
+EBUILD black-20.8_beta1.ebuild 2243 BLAKE2B 95683182ef2fa7a8bf0515fd37cbb1b09eb3ba37889cfaeff83486fa44cc5c4de74747189db7e706ab85d27716c90912bc3771e99e88f2347ac9ff68ea6deb48 SHA512 28bed17007da003987b551f911ea38977cdd63f0a47433f4c5893ee5e06b0b1e1032667a7e5a42ec1d864d7dbf9c8a9fa87b25505b9d398f90a95435f4f70176
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild
index 4ec223eea24a..b508eafc855c 100644
--- a/dev-python/black/black-20.8_beta1.ebuild
+++ b/dev-python/black/black-20.8_beta1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 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 ~x64-macos"
 IUSE="test"
 # bug #754201
 RESTRICT="test"
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index a174aa4dcef4..33f332040ef9 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,4 +1,4 @@
 AUX bleach-3.2.1-py39.patch 1637 BLAKE2B eeb66b15ad738d07db70bbf4599ef393678ca737d122efb7b0c5b5ae6f153b8989b4efc0bf26bdc34c9391af0e81fae5a0f01bc25e2b11db0c5ca76785d6b848 SHA512 5bffd50d9be425a97d6032ad6a55e2d92826ea9e074ea76039a94377c2b4f53599a740cd7fd5c6f90aa2ba87882d46514d014889b0a09f8273fbd31fa98f5b50
 DIST bleach-3.2.1.tar.gz 179763 BLAKE2B 5288277ceae1f51fb76c360db72fb646e1d391b3e51f29ba2b25f5dba7704af8ef7cfd2db017237dad42ff4a99e502daa29cdf4edd82952e15842e288c50c0dd SHA512 61710f48f00333b38d251360736e19078063433ca4d7aada210a986f7d79b08c79c64b412686c67f360e4b2e8420c40c4b515eb175ab92bd546f88e2ba0e5835
-EBUILD bleach-3.2.1.ebuild 964 BLAKE2B 0fc52adbfca45e15a806fd2e4ff20f229f3699f9cc7bf6fc5e58b059f1cdd345c62628a18e7ed3cb8acd0cca919dfc0fd871e4aa4d70c3dfc9f9de2a0d70d1fd SHA512 e091913b8ff9b96d43aa5ce395fd7320f3741c243652825eab7b91b070bd3057aa50405673dd950dc0c2b22ce952fe917c81bfa0e004143fc92570efc3ec6c1b
+EBUILD bleach-3.2.1.ebuild 975 BLAKE2B aa9a40dabcee96932573da3b5424cb8cb511ccc0de443f9734e559969b5452e569e229f081cf3e900e12f2bdbca87231d5552b716811cd4b9f6c050d4a3e4943 SHA512 a960fd1ebb953d690180d7b56f533b02c497c1ca3dd7d6370448dcf9ce4e3a04c4d0edc68437ef7b5af12a0c77901f578fee129d7ed5d0476363b663546a4c2c
 MISC metadata.xml 400 BLAKE2B 931735ca08509e3a1f8803181a1eca6be10b654fe37244772eb43b918dcac641c1733e535f2504bfc311644e52506712857ea24bf4784cebcb8b6063194d1388 SHA512 b73e3cd77b2378668b4086395f9a268105d94992f7b9d23ca8cfb834d015cc3ca0ed995acadba9060a5e96d29bae128b850a803a11c4b3d993f518180d9b4b5a
diff --git a/dev-python/bleach/bleach-3.2.1.ebuild b/dev-python/bleach/bleach-3.2.1.ebuild
index 147371a7c288..3ee875bd829e 100644
--- a/dev-python/bleach/bleach-3.2.1.ebuild
+++ b/dev-python/bleach/bleach-3.2.1.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 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/blessed/Manifest b/dev-python/blessed/Manifest
index 79c989a10d30..115e284bd013 100644
--- a/dev-python/blessed/Manifest
+++ b/dev-python/blessed/Manifest
@@ -1,3 +1,5 @@
 DIST blessed-1.17.11.tar.gz 6697714 BLAKE2B a181fac1675b0e06bca54346bd6eea4032fde739888d36a7ec51afbe899e5cc71ad924b6bae45777d9b56567da1771f89d451760ec2b62abaf10f6235c69a66f SHA512 51e627f27aea0082fc93a4b1d10043b1152ae8b625dbb6c73f75e993f8eebc41ed1d8e64667de28afbc4606d066a90dd4c69c79fbed7b5b928d126efd3fbac22
+DIST blessed-1.17.12.tar.gz 6697754 BLAKE2B 0ae89a587a34936b31114e4bdf77effc51e0ad01b31f3b7e037fe96a44bbfecf1e2f64495d09e2627343f8021116ba1a2d6bccdaac7998b978aebc54e60a7a13 SHA512 134bba81793e8e0e33afcd9daa7453f11857b3207d0427f061ccfc0dd1caa17cff32f84883860f69e2a98ecbb5cc609f2a1091ab7ca8ff42322f6e8466ae06da
 EBUILD blessed-1.17.11.ebuild 1314 BLAKE2B d6c799b00dda5f55c163d54e3a1d065964ce380d672e4dfe690d10bac53eefb2fa85c6065ff4435bcaa8bce2da776a9d805b5435c2de82d835207ccd6e29542d SHA512 988b1b0e2be9aa282d181e3ee1ee05db15646c82019b762414d30ee3158e6ded524dd28cd05be919273bebe9fa36c7540c4d34d97e7ad41d485216fbf564343a
+EBUILD blessed-1.17.12.ebuild 1314 BLAKE2B d6c799b00dda5f55c163d54e3a1d065964ce380d672e4dfe690d10bac53eefb2fa85c6065ff4435bcaa8bce2da776a9d805b5435c2de82d835207ccd6e29542d SHA512 988b1b0e2be9aa282d181e3ee1ee05db15646c82019b762414d30ee3158e6ded524dd28cd05be919273bebe9fa36c7540c4d34d97e7ad41d485216fbf564343a
 MISC metadata.xml 431 BLAKE2B b957fcf973dc786a7358b8554d5969688c86974ad0d304ac752f1f48d246ba955a9acbe4ccedd0a670a3039488c1b9dfc6815b08e08e7085fbef39e62c447f59 SHA512 b962ca5f456fe442dd2d88866d9aec050d0b456b53f22900cda6ec304a055909c0befe2de085775283c9b098fc9d7f53351b9e67d55eeca1744fb09622eebc01
diff --git a/dev-python/blessed/blessed-1.17.12.ebuild b/dev-python/blessed/blessed-1.17.12.ebuild
new file mode 100644
index 000000000000..9904bbe07429
--- /dev/null
+++ b/dev-python/blessed/blessed-1.17.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..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/blinker/Manifest b/dev-python/blinker/Manifest
index 55d0456f8063..a09c64bd3034 100644
--- a/dev-python/blinker/Manifest
+++ b/dev-python/blinker/Manifest
@@ -1,3 +1,3 @@
 DIST blinker-1.4.tar.gz 111476 BLAKE2B a9ebe32bc01f7f08a5f180caa3d3830eaa10b7c0499c11ff4ceb71ed604f94dfbe4c783cc7409a57da28d6d69cc49d7861d05401802f86d054bdd2501f36cf60 SHA512 2f5f71b05c7cc27f5761ba698b05c78c8a491f5285c120e532d24be0c8256daa14e075f3f30e15fb18e7c3f16579af9378a155d058f170e3af9ffdb89e49f56e
-EBUILD blinker-1.4-r2.ebuild 640 BLAKE2B c6486f390d47e2200dda88236cff9f31a861432b7ca718f27830a0b426da57b4dcb0ab49a2a00b07e9de71eb6e136dbd05c5c0d6aa139aa4cd0d074b388a8205 SHA512 9c3c1943dc03e061c86433a64b0b9f3ebe208732a206f6534cf2798f1ce3e2bfb1868f78fff6990ef29a073598c8497eb83f6fb75a8ef0d5f3ebe3f943c3ff89
-MISC metadata.xml 310 BLAKE2B 4300b6665f80282364e473ec1113f6cc1a2f33f81ebdd4c9a070a7565cd10d83026807ac49472fbbd0c09df5b58eeb18c407b3487a7de8780149b14bdcc09c0a SHA512 4712a1a048dd03c070785ebbefb637eade345c4959994d74643f9f521ebbc3c5477e38ad7628de967c13ceab3c906fd54db6322f8a32a43a47f3223cf8783250
+EBUILD blinker-1.4-r2.ebuild 651 BLAKE2B 6bf9abd3dab49431d2e4853838c22756b3ff38f1a43c4edbdfad24b964cf82144253a4b21f5b2409c48ae3fce5a7985a3e90f4c2cf06fbf2245316259662aeb9 SHA512 bc70a868c455db73da4290b6e17baa258499b7b7b48b085f14a823da2ec5422ac9de9fd86f80da6ea24fc09c09246424b49144429f53d2c3066d03d8b508cc4b
+MISC metadata.xml 334 BLAKE2B e5f3f1c86a46e6a97d605eb314546f184823825da552a9825f7c8ed5d037db4e99847e6e1b017f43e6551b1e217828d7fafd991e269dda2f8368d8c9680af155 SHA512 191d520d47461f834f00e0d3096862eefdf5b76c7806d8a98c4f8999aa480c9048644a7f1f6ce549dd7bc144beb891e34caf6a0e939f4d3c5f12fd1a4791703a
diff --git a/dev-python/blinker/blinker-1.4-r2.ebuild b/dev-python/blinker/blinker-1.4-r2.ebuild
index 00674e68804a..b32e7969986d 100644
--- a/dev-python/blinker/blinker-1.4-r2.ebuild
+++ b/dev-python/blinker/blinker-1.4-r2.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 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 ~x64-macos"
 IUSE="doc"
 
 distutils_enable_tests nose
diff --git a/dev-python/blinker/metadata.xml b/dev-python/blinker/metadata.xml
index 45a585359f8f..6c6c2a27a356 100644
--- a/dev-python/blinker/metadata.xml
+++ b/dev-python/blinker/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">blinker</remote-id>
 	</upstream>
diff --git a/dev-python/brotlipy/Manifest b/dev-python/brotlipy/Manifest
index 0a6eebff4ecd..61244dd70c5e 100644
--- a/dev-python/brotlipy/Manifest
+++ b/dev-python/brotlipy/Manifest
@@ -1,5 +1,5 @@
 AUX brotlipy-0.7.0-test-deadline.patch 913 BLAKE2B f7a57989defc3cbc6aa0f29d9db73d7aaf5abae22609b4d501699b4e5195f50fa8025feee64e7935584868d5100f3e088abcc2086056058464f3f4ad14a939e6 SHA512 c125622a149582b0e45397877f4f609ced2d9b388ed101a7a5c0bdbdbb849093538be5ba12e6d549c7a9fea1df3c74dc8dcc3d4bc894bb2ebae0117440b1d5af
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlipy-0.7.0.tar.gz 19375 BLAKE2B 035dc8757e491bc4fc0d8e2b6b82703eecc8f6f4150da42fda0f6c6f42a617519f5191371eb1dd976b8bbfeab88845bb018b874a395cdbf0ff409a6911f969f5 SHA512 bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf
-EBUILD brotlipy-0.7.0-r3.ebuild 1465 BLAKE2B 0b82b7aa05b0e771ef0fab078d73ffcc419123c6342d434d14d4a61aed05f922c2ea823795fd8c9df445385f4ab5fcd6fadb5c6e996a23a642a55c5c7bf0226c SHA512 f90f96b7b8d39108b04bb8860f2992b00977510f6c5e556e65b934f7c0ade2a292f2e3617e21c47d337029840b42e59d34d01f780719f4762b9ee0e6c3d6c3a9
+EBUILD brotlipy-0.7.0-r3.ebuild 1476 BLAKE2B d20460de46ba191242127e20ed96f6b89e1d404ad6a704eb793bffd8d252efb4b441cf3983d571bf08c6a9ddb6f172b6f8f958f9988feb1d53f38e47fa06eb8c SHA512 fddd9ef185395032d3cb22557715c74565ef6e6565e4c8c5c690424d3475f277c3e672f7290d07272a0e25bc55f729752391a6b9adc9bebecfffb0351043687d
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild b/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
index c542d45dbf44..7cf79b8878fd 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 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 ~x64-macos"
 
 # module name collision with app-arch/brotli
 RDEPEND="
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
index 8e5d5595c385..20e431c52c72 100644
--- a/dev-python/castellan/Manifest
+++ b/dev-python/castellan/Manifest
@@ -1,5 +1,5 @@
 DIST castellan-1.2.2.tar.gz 67085 BLAKE2B 5a6af5fd91e1371ed9024bf09f31bc5b9e7d55455a61c6c23f62fe84d80f717e83c96f2c72375c37537fe4fb7484b7a16e668f6e37ffa14bfa04f6e1fb69eaeb SHA512 3777180ecc2a2a26c917d89dff28d2ff9e20e1de86249b0e5cda63027394dd8b5a763314135bebba3d2b6194825068c9a7c1c32a4a1e3185caaed74a105aa032
 DIST castellan-3.6.0.tar.gz 70924 BLAKE2B bbd9bf5b411332d5454b4c0d69b63c16b751f8e23c01e723a95acbc722f57fb5f1286c20855b9a9a0e36607737e417f9c5b02a1f7ea4e394c210fa812feb6323 SHA512 d2eb7d7e9ecf29f43d16f0d95dbc18165bde7c9087670fde817fc476a58d57cd3765e9706e4108da99159065748b78dc1f25b9a6ae024359ed98ea5a10dfe3c4
 EBUILD castellan-1.2.2.ebuild 1098 BLAKE2B 054592ce40101386e2795b1aaef7e9e400f72a322183a0f4305ca784975b7962864b0aef6d2d198657b2e8a9ab8e2591a9926281cc2ce11b9c245fe4aa4f5542 SHA512 2f0e198b9920586feb08629468f48c5ed959c2fd69c7c1f2d27bf08f558a05d9dc4bba80099c6ff5fb8c64977f3865882f8d63e6983e3c0fda61fc00ef684d8a
-EBUILD castellan-3.6.0.ebuild 1132 BLAKE2B 9385d102c2af361792cbecea264a5feca68fb440b6e41ad96f6690473a44f23744ed6e99659599d6dc8e1e857b93f4771fc2ef7841a047ef2a8475aa36eaac16 SHA512 46b3569b726b33c273624ae98d6a3da9cffdf21ed2d24413fcd9883cd66c3fef830f8e385ac09a044e28af84b98a9aaca7b149c9d4b17f5a07cbbae6d4846a99
+EBUILD castellan-3.6.0.ebuild 1130 BLAKE2B 0acd7b316afff20a02e8135bc6f09e9f5b95873e98a17cf4c639cdb1e5e2a250fb8ac75e94f31eae1a7bc54361cd4bf2b5430f1a93e1a7c4a609fe3f0745b08c SHA512 ea53e988a2a0e9045e8217be21bc18eaaaac802dc0616fd3c9544936cd1350cbb30e28ab59f30e20f27e75524506c83703670246d146f832e146a89504d360db
 MISC metadata.xml 350 BLAKE2B e268e6f00ea7e2efd2a8b7809772dabcd667292326d31b6dfbf02950b8a2308546aa9c2355143355228067b29deed90d7efb4a366c59315c72f2b0848846ca37 SHA512 1253053f789a6f674d002641a8da8599324736b8d0e58eb80245c64f00d32040c865cb3979c709d9bf27f25aad31a30cf818c3c6806ca8172d6ddceda2c9a02c
diff --git a/dev-python/castellan/castellan-3.6.0.ebuild b/dev-python/castellan/castellan-3.6.0.ebuild
index 382236424dae..036e5deff557 100644
--- a/dev-python/castellan/castellan-3.6.0.ebuild
+++ b/dev-python/castellan/castellan-3.6.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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 618f96a9ba18..44a485cb741c 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,4 +1,5 @@
 AUX cffi-0.14.0-g-line.patch 9258 BLAKE2B a57cb8836dfcfb1124b1b72c38fb4c02d231fc7116c2de4b970e6423d037d1aa382173a4bebb9dafab0d690df485a64d824aafcdb16e31d01b391c25f4c239eb SHA512 335758de740050256af711e688072bbe4ac835551437bc2fbfd4dfaf5492efd5c722bca3bd8e5747bb0a88d3e7e6f82b78f85f5f42a4f11efb7b2f6c3ae4a492
+AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534df1b881058cf7efdfdecd9df063c27ebd26683edad43e3010e1c01d9d93c5d98785ffbe65a5e3317d96ebb6a3132aecdab SHA512 75335871b8f98223e0247defc3d08f1c10ebed58c79790826c4e39057e6757b8bdc07e2773ad25482ed17c13480b3e72b3667e48697a456ed0cc4a39e7d91b79
 DIST cffi-1.14.0.tar.gz 463065 BLAKE2B 4d1e8a92241db801848ef8bd05ea15a31c7f61ea426ce4da184aff00df786348d2c76de9dc48898c814478aed9750b665868df24ad39435062cd7e1c84163e52 SHA512 4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253
-EBUILD cffi-1.14.0-r3.ebuild 1339 BLAKE2B 7401313468a10d1a2afef4d080b76d2a0ff0c0b08513aa6f60e38eef7d2f2f25f63236f9dd3cfd3dd27504f12a0c001d3e0e4b656c488fef6767fa5db71837ad SHA512 f0d7b6b660af4d535c7037c3fa5d96613d85e7944d847faec4a810ba2421530b2732529e1a7f73c537d4e4af68e63e20a5c402aa4781ec1f02e5c2af91713757
+EBUILD cffi-1.14.0-r3.ebuild 1387 BLAKE2B 3b57da73b7b31c1435e3168987cd4a4ec45beaeb0a0d852eee2e2e8a09ec59a04cb2816d964e9dd957746b9dcb879ee16f661db0bcd08538aea50df83fb4c313 SHA512 353f6db5ae87c5e626ef49e8cd1ece7e8d1437ea2085006b61caae8f03a46e21b22245339fc972d879c384cbb6f895d4d41b1ad29c882243d49d1c68fca459de
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.14.0-r3.ebuild b/dev-python/cffi/cffi-1.14.0-r3.ebuild
index 4a459635cd1e..78f80a7e2b31 100644
--- a/dev-python/cffi/cffi-1.14.0-r3.ebuild
+++ b/dev-python/cffi/cffi-1.14.0-r3.ebuild
@@ -31,6 +31,7 @@ distutils_enable_sphinx doc/source
 
 PATCHES=(
 	"${FILESDIR}"/cffi-0.14.0-g-line.patch
+	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
 )
 
 src_configure() {
diff --git a/dev-python/cffi/files/cffi-1.14.0-darwin-no-brew.patch b/dev-python/cffi/files/cffi-1.14.0-darwin-no-brew.patch
new file mode 100644
index 000000000000..c92b6112b853
--- /dev/null
+++ b/dev-python/cffi/files/cffi-1.14.0-darwin-no-brew.patch
@@ -0,0 +1,14 @@
+diff --git a/setup.py b/setup.py
+index e1dd39d..3e88f74 100644
+--- a/setup.py
++++ b/setup.py
+@@ -105,9 +105,6 @@ def uses_msvc():
+     return config.try_compile('#ifndef _MSC_VER\n#error "not MSVC"\n#endif')
+ 
+ def use_pkg_config():
+-    if sys.platform == 'darwin' and os.path.exists('/usr/local/bin/brew'):
+-        use_homebrew_for_libffi()
+-
+     _ask_pkg_config(include_dirs,       '--cflags-only-I', '-I', sysroot=True)
+     _ask_pkg_config(extra_compile_args, '--cflags-only-other')
+     _ask_pkg_config(library_dirs,       '--libs-only-L', '-L', sysroot=True)
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
index 76ebed988863..145a13347b2c 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,3 +1,3 @@
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
-EBUILD characteristic-14.3.0-r3.ebuild 666 BLAKE2B 849fed8fabf4e97e635eabec59ebb16aa90eef7283f20f907152c9a3c592a322f5814c1ac62058ed21726a6c28a05b8f18f633a0ef36ebb5bc274c4df37196e6 SHA512 9497c0ca39548634ffdf370cf746e079ecf2290185ada30701450e496bbedb5b8c77d2c8b4f27c5f570dcc7ef1bbe37c53971708ce05797a62b20c94c405ba58
-MISC metadata.xml 389 BLAKE2B 0e2226a252bf0308d7bf33b34eee3f035bfd242736b91072eabd77e07216104961c45f8469dcfc3a8871cacb4ed619bebfd3443612bce85d1f2ec4d95a13dd21 SHA512 291bc593113bd6fa148fcb5f978ec1630808a0a6b4ec7fb40b00596c9cd2bd56357fa792af91243d96ac21fdab420d370c0d1f59570e739be22d81b8add56676
+EBUILD characteristic-14.3.0-r3.ebuild 677 BLAKE2B 4793518f7dc738ba7b9798260b816811c437b807440139171cf83ec99fe6f94023d0d66f7b687ab832d1d0c886de99ef6eff9f1b8afc919cdf2ba2843b56045f SHA512 d30dde2aa2d1d8d51749118a3426988abdc67961a2251ed2a4184ef6a58ec1fd44d674e06ae17528d3b67c5762812abcb529c9094a7fa90349b35909a1034d78
+MISC metadata.xml 414 BLAKE2B 414b0954d86e4d3d96fbfe29f0777146dc3e23fa9c06b9e834b0f902748c60799c312a24383a25d030bf301513827d159247a26bb98a2d21834c15718decf2ac SHA512 2fa4fc6b9ea7ec6f7ffbaa838cff4e39b9b00b7e87e561ba902cdf0de5f60441dba15f8918f1b864c4cfa87b9b6e9e15119bf66038c39b37d307133691737e7a
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
index af4f4b639410..dd066bd757ab 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.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 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 ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/characteristic/metadata.xml b/dev-python/characteristic/metadata.xml
index 4e9bbbdfe8d4..db0f1528404d 100644
--- a/dev-python/characteristic/metadata.xml
+++ b/dev-python/characteristic/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">characteristic</remote-id>
     <remote-id type="github">hynek/characteristic</remote-id>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index ef0d626b42c5..dd0125654781 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-python-10.0.0.ebuild 924 BLAKE2B d160ab3d5b4b57df192aebc214061fcadd11233a7fd97480124797bc52da0f3026be74021c127b68eba8e5e3db0e9d523e20e36537fbee3fc19ae606b48a5858 SHA512 862f0822b486311c4ffec46db51030d707c43a21d69ea22b5eafbedf004679805371b2d453d0bfe9939818d2f7d9658170bb7799e601f6974f3621df03b5bc12
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B b96dbdf62c22c703a871c8d00971976f1f856dd81bcaf34859bbb0f4de72f74a459331d732fcd6cf9afe0913815573459a1db933e10091f5c99cb8b8d23be1a1 SHA512 f033ff3e59044f45926ce86a594226eaee03b76ad5ea7b9ca390cafb619d01416370005fc947f2b643072b2fd6d6d700f5ba0cd686fa10fadb6816fe56c6dffd
-EBUILD clang-python-11.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-11.0.0.9999.ebuild 903 BLAKE2B 5aff11bd5e99e2f0073f945c1a1980a68c12c50d5becd20cac9631af5d1e130fd8062e2edf60e8d93f0950a1a831fd84c2b829ea1112d970b86128173c95ec38 SHA512 d2354a7cd8442519d77decd7b531ec173811596715af25163c37f8214c57a0f9b3a8afa475485360b34cf1dcf449efe8f4e8af83d9b74f3225991fdfd45031b4
 EBUILD clang-python-11.0.0.ebuild 923 BLAKE2B b96dbdf62c22c703a871c8d00971976f1f856dd81bcaf34859bbb0f4de72f74a459331d732fcd6cf9afe0913815573459a1db933e10091f5c99cb8b8d23be1a1 SHA512 f033ff3e59044f45926ce86a594226eaee03b76ad5ea7b9ca390cafb619d01416370005fc947f2b643072b2fd6d6d700f5ba0cd686fa10fadb6816fe56c6dffd
-EBUILD clang-python-12.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-12.0.0.9999.ebuild 903 BLAKE2B 5aff11bd5e99e2f0073f945c1a1980a68c12c50d5becd20cac9631af5d1e130fd8062e2edf60e8d93f0950a1a831fd84c2b829ea1112d970b86128173c95ec38 SHA512 d2354a7cd8442519d77decd7b531ec173811596715af25163c37f8214c57a0f9b3a8afa475485360b34cf1dcf449efe8f4e8af83d9b74f3225991fdfd45031b4
 EBUILD clang-python-9.0.1.ebuild 924 BLAKE2B 8a666866e1c2fa2806c29ae6c6787cee7dd7bbb33ac8d2d99e9072d13f8fd0b1a98388de9f655b9f26bc43085269af402592d62c29dd1ff3f2e1564c2e8a4c39 SHA512 c0c164894497d871a3016ec8dc19e09142f5f77d194dfe27d9ad12043daf22df7abaacefaa2294e7355aab2d45fe7f578e80ff7df87af6dcc0c75e8128f885ca
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-10.0.0.ebuild b/dev-python/clang-python/clang-python-10.0.0.ebuild
deleted file mode 100644
index f0886b6c9c3f..000000000000
--- a/dev-python/clang-python/clang-python-10.0.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_{6,7,8} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-11.0.0.9999.ebuild b/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
index 6d7cb294e651..36c6ba65c994 100644
--- a/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.0.9999.ebuild
@@ -8,8 +8,6 @@ inherit llvm.org python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -27,6 +25,9 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clang-python/clang-python-12.0.0.9999.ebuild b/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
index 6d7cb294e651..36c6ba65c994 100644
--- a/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
@@ -8,8 +8,6 @@ inherit llvm.org python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -27,6 +25,9 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 19a5c02001fc..4b77e2593e60 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -3,5 +3,5 @@ AUX click-6.7-support-sphinx-1.7.patch 1243 BLAKE2B d4939d49d43b50a3cddb77899ed2
 DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
 EBUILD click-6.7-r2.ebuild 968 BLAKE2B a9688077b79665188b3e84694924ad3e22fc9a046a4592a2757b986a7aa44c68fef99f350707cf1b76aaaf0766c64f6b80a0610791189bbd13b6f96b7aeef5e7 SHA512 5ff0dd0a31974d1bf178c1b7927263e1aa33be304d84943b378faf5e9caf53bb448acdb80fd9a026e7e8dfd7bf100cb3cf192fad1afed930b840d25729aaef35
-EBUILD click-7.1.2-r1.ebuild 755 BLAKE2B c944f81fd759380af02732268e534f492393e4e1b86f3bd4bcfd287a41dd4689fbd0877fcd9b89e0c0e032a4871a927c9785ad7bfa2e68e23c674990f23a8ac7 SHA512 743592b77ddb2a73c57cd0e4ef5877e536251250549a8d011cddf392dd237664163cca1ae6a3ebf359a93aede1319a8a0bf497e76cc1e93f672e902f9ea686cb
+EBUILD click-7.1.2-r1.ebuild 766 BLAKE2B a347cd3700dcdba25f627edac3750abfc16517f61dc3cc4b2e782738c6a031c4e14732c2669832c4d4ff7277eb200e6bc4f7589c53179fd5a8bffb614e3f4df0 SHA512 98f7b384ef8084869d23d72d34b9aeb17d97a72f974157e1b1221b3a77e1b3f28a36b6b236a65cf54bb579485650ec03178281a611d42f540d343e5e9a049ff3
 MISC metadata.xml 332 BLAKE2B a41bc7699360c666ce286a0d9a44779fab5afa6e6ce99efec2ee65a5d8d534bf3ccd65d4b23a2f5d40fc3b1c04c3c7e078a8889a3030909e7cc3992eabecfcb3 SHA512 de78734678a4bafe5175228f6df58210c65eaf016efec93e65441109b280725c4994406d0f21f2ee22ca0f9e1e27e27f76b3a1db724dbbd5b958fc8d8410126f
diff --git a/dev-python/click/click-7.1.2-r1.ebuild b/dev-python/click/click-7.1.2-r1.ebuild
index 9b40761fda04..8de60db85a70 100644
--- a/dev-python/click/click-7.1.2-r1.ebuild
+++ b/dev-python/click/click-7.1.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 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 ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index 25d8861e5627..4899a23ac605 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,3 +1,3 @@
 DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
-EBUILD constantly-15.1.0-r1.ebuild 703 BLAKE2B 7de985255dd471129eff7fb8b6a178a430d95c2c05c22935d520eb537e40ed1b938c05d8d08ae8166d56181c1ed7a6afa22078853fc0d0f19a5e60d0841c1b06 SHA512 434dbe51178523147c7ab7a55f77d7df6330ebf0c10a0a1ca96386c77aba98fc0cb024d79d8bc6a3b8200d76cc0c90bf0315845e22d407f5d8086718eacd0090
-MISC metadata.xml 737 BLAKE2B f434d4398ccc7e8feb419980f2a71e69a74eb8e66ce506c180349bc4a3f69947e6002b3d930a3f3695f63f8acdba692c531cb9e700776e0889422e235e0ee5af SHA512 eafe24ee36b106a31703feb548b75d4eae9ba6d5a903570351bc647cff3f42ea2481602500f53abece88ac054b46629d46a5643148b514fda43f53b5d201875d
+EBUILD constantly-15.1.0-r1.ebuild 714 BLAKE2B 310df594b1f6be7dc74e6fda28109767bd45a3bb167305e8336425ae9e1f2df58ad02521f701d62d36fe4dde1b9de7a9fbfb8e9c55c873032e052ba59488a2aa SHA512 65da33db531d52ebe13f2edf88d53be3638cb54156a8354676d9baf4130a3104f668229c3a4fb3a55bf97dedf5fa9a1a678116ca9cb27c2400e27d6047280fa2
+MISC metadata.xml 761 BLAKE2B 56e9292aabc0bd3f53ee9a088cceff84f98627b41bbe6c3a53bff4815f6f6f5e17ee80eec930edd288fe1b5fafc46148dce5831cdb23029702e9129fb08ac467 SHA512 f863f2159271ef10d54aa50c538f8840fbf851636901fa93ef0d7d96741a1a656ff1e7e36b0437088a977f52b2252d4336272751246fd2bfb59de1ff7204dbf8
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 7f1753cbfab5..24f5353d2eb2 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+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 )"
 
diff --git a/dev-python/constantly/metadata.xml b/dev-python/constantly/metadata.xml
index b7bd76ba47df..fc2fce3e74db 100644
--- a/dev-python/constantly/metadata.xml
+++ b/dev-python/constantly/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>twisted-python@twistedmatrix.com</email>
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index 0f444be25d08..48b5b325f038 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,3 +1,3 @@
 DIST contextlib2-0.6.0.post1.tar.gz 29670 BLAKE2B 927cbc674c2cb568e71bd110773bea6f848233928bb910e0db7114812b3359b9395e43c01be1645d44f3202f94c62bc21c4db883a155c64feb636a61865dd7d8 SHA512 bd3b458b365bc1d556476f6368bc523fde07e85afdad74037aa98d7a498008103a789f6b481b606700da92606ee6477fc5a817f1596e93a6e3c548ed0d4a5bf8
-EBUILD contextlib2-0.6.0_p1-r1.ebuild 927 BLAKE2B 50de0c2a86ebe47df2740861cadbf3f93a24809a6bb642e807db8cc42b5cb33aec38a0ff7e0d0c6297567cc966ee7196f4f4a40552a2af196349f9e8989f4bf2 SHA512 55a32f7ec4fdeaf8d36aecaa64a7d6022897b297749ca29914b7ae1cae4e89a3952f90fb06416b2fceb47981935710e8dcfb0b78bd0f4d04c6d9cbbafc56b9ba
+EBUILD contextlib2-0.6.0_p1-r1.ebuild 938 BLAKE2B f27f061a7e28fd5e2103929e017abdd4642838a5ea995f0446d514704033466affa7b7edda383ae346f002777ce8e2978a04dc01eddeada3a71cf69521172105 SHA512 76b6f93a0881123247257797452b700900ca1c3ca17ffa335f3dd0ad122a5d7cd50036d70a70d51a46d815f2372a6973dc6c3dabc8f56c15fa75498840caf407
 MISC metadata.xml 349 BLAKE2B 199f23d7a13fb54ab53398cdd83d16a2db50767df6ac02c09adde49fc93df406e3be3762840a897088f54481317d4f800c472636c66620ad806d8f04285c1192 SHA512 d7f0e31697124f884401636805e03f4de0f8fdbe2885d64f37880a534574a4c60fd4f96ba6b1286aa28995071422e1199d59ae487296a1261708f2054a06c269
diff --git a/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild b/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
index 201b3c103c79..417f7c51e4e5 100644
--- a/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2.4"
 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 ~x64-macos"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index d5935568219e..7a87bab4e92d 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,5 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.3.tar.gz 693632 BLAKE2B 9daa3a0fd7f8c3ff7c9d68603e11a0a419d3ab50e3c3fb6be5b694aa1f7566040e1212b7175dfa4f71a0a309db325c00f94a85e0e9e755ae8c4f09c499d0daf4 SHA512 f40a21c394b1a72118965f702ae2b8e09c4e0b2fe92709aedf1de4c8074cd9c2cae0ed4860fbb863e4e5479f1067ff806d7051f7683d6b324de9945c0cacfc39
 EBUILD coverage-4.5.4.ebuild 704 BLAKE2B 2a43852aeff1c2e12dcb3cdc197dc1a245e522f293bec33370da6f88b461fad3189d1fc35554d60897a34edb4ec484607a980de6b9e61df147fe150739390f36 SHA512 9cac3135fd8c6a52205ac3ae554cd6912082c78a5c500ed2edbdcf20fc056b8cfc62c84bf64f60316d5934aa82088003f78678aa9be346f0840ae56495aadb7b
-EBUILD coverage-5.3.ebuild 1888 BLAKE2B 49eb7e02280cd92768ef79b54a1a122687df236ad3d274a5e9206161561f363f574feff86e7ce3c607144057937f3b6667141e5a62d0412cdfb36cb407409b04 SHA512 ab315289064de6b46e424cf1ed422b929a76d86203ad91408d301f512538702900ebd0d6ffd880ce71dfdad2bff5a359d425008907503662e5090051c25a75aa
+EBUILD coverage-5.3.ebuild 1905 BLAKE2B c6793ec3ccc9bd65faf0e18ba76769cede60399cb2430234cc415d88d68db7c75716635ac3415b5d45189514e0fe7c3bb6789ba1817f4e8fc7fa240f9af63460 SHA512 88e6566a399ce6b6326cc22217ee9a10656f0d2a88f336a6678ceca3261a1b01be7cde4e5bebf6f98c601166819def458e783240d89c16f374dc5b4e86f9f025
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-5.3.ebuild b/dev-python/coverage/coverage-5.3.ebuild
index 6f1953cdc422..154b30d5b69c 100644
--- a/dev-python/coverage/coverage-5.3.ebuild
+++ b/dev-python/coverage/coverage-5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index 50732e8c975b..af59e66b4856 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect-1.1.0.tar.gz 35516 BLAKE2B b4480ad4335ba15ae8a2ae758ff942865a5b61de68b3b00fb59d517b1dacfce1cd817280e4aac562dbf829f90601a56220f01d99aecbc502420b9102e50c46ca SHA512 b33bca6a026f4de37b75606fd238dbd170b57d06288fbff3ea97ce79685a99af275fb8522b04ea9d6693aba5a18541d70b657191fdad881be79718bcf2e7655c
-EBUILD cssselect-1.1.0-r1.ebuild 757 BLAKE2B ca2a2d3733533ba23a30124ac7620a7bcb0996b911b192dd7c0de92ae970c464519cbda678c4c725ce6a95cbc1585408971cd84cfcddccb526bce1d9700d5a21 SHA512 43b53ec5e489547272fe4842618edb184987d083c8e82ef64df1459d304a320bcf0a674fe4b3ca71f6a7ef9a16d03c51c950f497ff54c29d2d6f5a1affde1ab0
-MISC metadata.xml 322 BLAKE2B 2ec56f6e5522f780aef1a27df29af54f7169cedf727e4698c0c3764002501a06e52db5a94901d795d75f792ae2e8eb7d82625f88e2069453c2ff4190352aa7c9 SHA512 9933f17432e27a6a708ad4c9ec1e5f65197c4c0048fe2deadf3ba66d878f98510e150dfdb83cf935294a529e505b261808b33503f5d6acb622ae1821e065d798
+EBUILD cssselect-1.1.0-r1.ebuild 768 BLAKE2B ca30ca2d63fd9005c0cdbb78bc79994e8f1fc67d217e9a5b264ef29143daa363e24d33baf41773285346e372fd24a05f1aa04aa308668c917328f977de7964c5 SHA512 30f6f728af71dc212e0d759bd3029aaf4c882312a7b98983c3113c21d31be6686fcbc29572b675956dc6e8546952c793200f831ddc7b53a5366674e2501520ed
+MISC metadata.xml 347 BLAKE2B 20bb640e393498fbdc33ca98b9c12f00a1edeed7045bf994c19f54a58a12d5fc49febde2b8942a8ed5c4062bd0b5d6e7ee8e54a54b3d9d7cfc3b4c461463fdcc SHA512 30350a626aa8234991a13f4f650ff05495ee177f9d6acb21973325a8616df5db76bf5db0a3046f7050601f4938684e71777bdc85171902f6c915596eccde215e
diff --git a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
index 9888e40d1b39..ef25a4a34926 100644
--- a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cssselect/metadata.xml b/dev-python/cssselect/metadata.xml
index 702fdf02b1a8..56773600370c 100644
--- a/dev-python/cssselect/metadata.xml
+++ b/dev-python/cssselect/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">cssselect</remote-id>
   </upstream>
diff --git a/dev-python/csv23/Manifest b/dev-python/csv23/Manifest
index 1ce09ad2b425..f1ad0a3c42fc 100644
--- a/dev-python/csv23/Manifest
+++ b/dev-python/csv23/Manifest
@@ -1,3 +1,3 @@
 DIST csv23-0.3.2.tar.gz 24132 BLAKE2B 2c5eb231814e087dce9689c7075bdbc3875b3e200dc1273022d55661ec60f18a5bcb03e062b205fde13e845e5e50d530b07596b51ad7b2a89e41b45629bf3ce8 SHA512 289386cce5de4ae5bc42fc56d1639bbd1483034e5422f63142c1d188de735b1f5f18f9f69e3cb96f4ac3e1d7d0b371b1c45e720982c4f4b539fcf0d2da893f6a
-EBUILD csv23-0.3.2-r1.ebuild 742 BLAKE2B 972855bbae0c5a00725f2d590fa0104f91d7e89e0d9184186802b85dadf8ef85533deb90a25d8453b6c45452621ad8fc9d276bcb5f8a6cf270ca56bd8a56a274 SHA512 6208d1788121d830f7eecc23fc5457a974d2a47886cd46749ac663d8c0ea0bde5b2948e6211356e8a5fe47ba397150693494641aec22851820aecefbbd8b5575
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+EBUILD csv23-0.3.2-r1.ebuild 753 BLAKE2B 4f908e5efcee009259aa3ce10e64446d973549b81ee926ae1b95917586994bb05202ce76923cbd3d9f95a954079c5b10c2e20c2bdb8d20531b955e29cfa329e1 SHA512 ceb03284cbe408d7fe77c32bf150e0041ebc9934bdb2b9cada0ed0c95b6e1f28d3fe3e202d843a55dbda687ec0e51a0b16ca4cf593293e2ea6f3522037fe7153
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/csv23/csv23-0.3.2-r1.ebuild b/dev-python/csv23/csv23-0.3.2-r1.ebuild
index 7787a9717dce..02e3fa1a5fd6 100644
--- a/dev-python/csv23/csv23-0.3.2-r1.ebuild
+++ b/dev-python/csv23/csv23-0.3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xflr6/csv23/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 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 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/csv23/metadata.xml b/dev-python/csv23/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/csv23/metadata.xml
+++ b/dev-python/csv23/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 45e73e87f588..6ff69f5257d2 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,4 +1,4 @@
 AUX distlib-0.3.1-system-pypiserver.py 1532 BLAKE2B 7bb2bbb2282bcaa943735804428b00f6c51fdb51c7acaec7efe653495acd9194a0544d5d49531a96ab269ab8a61ba87e3c35d4f30ce5275a0a284fadd88cc19f SHA512 b96579d450c5c33502edc57480d5bb00aa3b9b61333c43ab446a3cf7117934a6a14026b2061cbf28e69e88a515554f8a1aad732f685cb73f18686b1aba6379ab
 DIST distlib-0.3.1.tar.bz2 1068500 BLAKE2B 52135869242f71cc6d6887da6d9e20ffc6b46c84d8146393961062d92d8c0bd68e1309277f64fdec0319ff3c503b1caaba3d5378f5c081dca79573c8d9c2e6f2 SHA512 f259299176c45be7024b80759015a2fad120ffdde55b6abea0f7fb0335cee90809b5daedcb88abdfb68fd496284b2e478df622004b3750327bfc86807581116c
-EBUILD distlib-0.3.1-r1.ebuild 1447 BLAKE2B 3ceda938bbd0cc3b747402b7b55aa4581437457acf01e7cb3d68312a519d925e7fb51777e754295184852bd299f187ad24b7cb6f7407c00e68321413425bccc8 SHA512 10366437f666ad8526ced8e2ad4b4099b81e4954ab6533e7ee1b444ce29dbadf5a7f40828445c1eae478bfe9aa9397a8ee7abb325814b5c018706f44778f843b
+EBUILD distlib-0.3.1-r1.ebuild 1458 BLAKE2B c2a18d5937368cc6a7c9adea7f54f1b33d06b7db7ceea591b7643f5336d9c6e7e5c7b52b67cd2444a614c361d65038db9a4e7dd46191bc031a4c31125f655b09 SHA512 64ee7a3e94d6d2df3cf725481fc92041f3b7d8789368cb64dda81f5f060d29a5b8c8d4e23f398fae4e1e4aaba5236bad6514d30d33e95de10d4f64d6c12744de
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/distlib/distlib-0.3.1-r1.ebuild b/dev-python/distlib/distlib-0.3.1-r1.ebuild
index 2a6a5461296f..0a9a6ef399d0 100644
--- a/dev-python/distlib/distlib-0.3.1-r1.ebuild
+++ b/dev-python/distlib/distlib-0.3.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 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 ~x64-macos"
 IUSE="test"
 # This package's tests are extremely fragile and tend to break or hang
 # when it doesn't like metadata of packages installed on the system.
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 57d28292d599..643cf2b883e3 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,5 @@
 DIST elementpath-2.0.3.tar.gz 191499 BLAKE2B dd8ee226b5e04168de90e0375db971bb51aad233cbc56a63e1a79aa847fffbeddc5438ca769317ccd0ad6f30aad61ec65fe9dc7c32dfff687e8cd208ccf9ee46 SHA512 fccb291405aafa5751f0dbb636171145a41941e929dd93b097d61f11366e71757f47a65c32b83fd8ad0fafcfb530315417ea879b3e05421bc479b2e309960006
 DIST elementpath-2.0.4.tar.gz 191601 BLAKE2B fc2f29a737c180fb04cc289b8cd9149b7a4f3c317a5efd746c42658aa6fbfe5cb78b957f517ba9a9e8650cc1ba0ee885a723695a8a107ec4cc05328828f5cf21 SHA512 b114ebe054eb6f46e261ae2a39c8126b86abafba26803eee676731d8d46d613daf5493215873ae96c9b098f6ebf9961a1ac777ddc0a1e2b1e4a3ca924d74c213
 EBUILD elementpath-2.0.3.ebuild 671 BLAKE2B cd22a5ce0e6d7a8e738b2e25854197669bc611640d6846e1ca3f9475965eacd2a06f8fb47c9abd87e509bfa4ad20bef0270dcb7a1092bab2063f368b3fd8608e SHA512 14f0d3e104cec625349da984bde32dbe4da1a48c7e28c5d7f2784a0d743f2627cf8d2bb62f06851c1f47d7e715f1f02933c87abace95f10b3bedeb2fc93655b1
-EBUILD elementpath-2.0.4.ebuild 679 BLAKE2B 0bcb031d256537cb2029e11890fd365277090465c16efaf359b7cc3bc4966e88be6dbbf26fa8574f470b0ba9e380913662ff1a42dca185032e378b700bfdc220 SHA512 0329166440ce98ab0489e3746e766a2692e7426b8d00061985ad4e5e1774eafea9cf22a930efb304f61ff74adf90f76aa513ef418469d66ed076b1aafe6ae998
+EBUILD elementpath-2.0.4.ebuild 690 BLAKE2B 193db9630af873698b4d5ca8640204dd9d24b9f1051240ca91cb9795cc2f4979ec73a83d9b5dcd4cf0ee93fe60664f12a5eda5c0bb861741faa04a6a14a7b3e9 SHA512 6642fdfe431f8af623ab606e92860cc4cfb78469be3679110b2099fcc055524b37014ecc987f71ae15c9c425be323c6d15c748bf2d0d7986c16e3bd06a81082b
 MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/elementpath/elementpath-2.0.4.ebuild b/dev-python/elementpath/elementpath-2.0.4.ebuild
index c7a8e1d2336a..658c4c61f188 100644
--- a/dev-python/elementpath/elementpath-2.0.4.ebuild
+++ b/dev-python/elementpath/elementpath-2.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index 68e8819cf72a..432cb992c252 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -1,4 +1,4 @@
 AUX entrypoints-0.2.1-init.py.patch 243 BLAKE2B 79706eacd51f9eb2b9bb319befc01c44894e2fa0c394585d2ad578b07e64fa4a6fce5e7c8f1c50752b1fa63e05776186759bc1ce426559405fd0a0e6c8b14aa3 SHA512 f25cb047aa8743dd9145c8e5913c53b5faa6a2b0ed3a50a957d69739bef43b3a6612ec38754bb088c2f9a8e116df61e00962fd1a78c45e5c107cbdd40a9569d0
 DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
-EBUILD entrypoints-0.3-r2.ebuild 822 BLAKE2B fd125e4aa6d3148bcee16212c3966a61015aa24f7852c3504f99389715efbb908b3365ff951b0aa5b44bcfb81832ed3e5847da0636443b4135308e5627e94377 SHA512 fd3b03f1b805d36cffbdecc2b39215dfa00c5fb90fc782956f01686e4ec886b179346c5e0d72a07dba30804d8507e7c129e387abaa8272cd7102a3f1e77e9ef4
-MISC metadata.xml 730 BLAKE2B 4036e332f77d99dc24f55da8e75cc96900cba2a343a4d372c125a5eb8102a6ee789b72a87d8339ac0352e214c0c5e2c554d6899795f3ab84df3c441b9f75f542 SHA512 7febb502fc9aad6bdec9c698275aafee404cea4cea59f554a101a8186df401d227d7d8b14cc332ee96b975ea513b5cef37de80f8e39ece138cc232718e1d5e13
+EBUILD entrypoints-0.3-r2.ebuild 833 BLAKE2B c77505e717fd0f996216f4c1acc69375aca66f7dd6e3114873a50643c3ec86fc47c2b47e8d139b3c64c73c381831938b9f5bd9fb01e370db26e0c5b304aa99e3 SHA512 f499ec34c3edf5e21cbdb0f221f21d6950e3b051e8e5ed428e6c77f36803f480c672a2948a102dfb09eed25e575bc959f150b3e2c987c42d5eba1cdc786e2828
+MISC metadata.xml 755 BLAKE2B 2bdb17501f0f4130ca9fa124d2994b95a383b3f2ca9b7f5cfee3bad344ad3d4e9ff00b190fa385a3485f300f85c9ca3540cd53523c4d03b08eaf6398d7e6bef6 SHA512 c416305f3033e682efc0fa3fc1414b2e9c82db59e876b18c393542a8d06e98edc458a2bdbbacd2dc15a6cb3ad3fe37dbb50063f1bb50e033888ee725f25b740d
diff --git a/dev-python/entrypoints/entrypoints-0.3-r2.ebuild b/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
index c664d0636e51..888246b10ea1 100644
--- a/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
@@ -14,7 +14,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 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/entrypoints/metadata.xml b/dev-python/entrypoints/metadata.xml
index 0d9b750420e1..843ca0b4843a 100644
--- a/dev-python/entrypoints/metadata.xml
+++ b/dev-python/entrypoints/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <longdescription>
     Entry points are a way for Python packages to advertise objects with
     some common interface. The most common examples are console_scripts
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 27213e85995e..b778f4195c35 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,4 +1,4 @@
 AUX execnet-1.7.1-tests.patch 7299 BLAKE2B a2bf00a2b283dcebb777ff4743f6dbd522ddb8ede743f77bbaa20b1b2e5956ea08e04359459a2c6837a5b2bb64585b8bf3bb826236acbbd874ffa5950d8d1196 SHA512 938bdc6185a5251a7f1e5185a694774a1b6e1c1ad39dbc444ee248f338f2e8a15dc3761980224f9eb378fa4c384a2c83f96f8a3ce55da2a24ea04b85997bdcf9
 DIST execnet-1.7.1.tar.gz 174157 BLAKE2B 0c2f7b8918bdd5a3cd1fdc49607e571874e20bd26a4806a6ec1a11359b912ed09244afb781670ff24fbee752516d59ab2bba7f662bbcddb802e7e6efd2c544ef SHA512 375748c03f8d955bd8fca90d5c6308073c31a978fd7a604257512e0a710f899dec5db8a91d5bb5f16de9b0656e1742da9ab513827a1a065a5125bafcf1e63a70
-EBUILD execnet-1.7.1-r1.ebuild 1175 BLAKE2B d881b677fac06227bf4e7dccf2a57d13b5bc18a9003e91689b1c5f0b09e10bbbfa76bd0584dbac87f90c9ab4858188d42c3b3f2e5fe118a7e9e17976c3bf2221 SHA512 b86c7209170b1a5db635771aec90bff9a03273598671b882691deb823f9d1fc71262ff084adf55a8cdc7e69b090d6eaedf0015ed11ae56a064d502ed54eaa9ce
-MISC metadata.xml 417 BLAKE2B b2dbd5a0b0bee658ad27c90d607e2a6ac13d7c11c9ce21571f041831136c6fbf52f888fea8658603b9768ca4201dbbda01cbc03ef61fd3a90b88677b2f2ebe90 SHA512 d264334e083c2e9171c1fed5cbdc02f36a39de150949afba267db382dcbbbe758a283ee81f59172db66450cc424a4398ad80f5e5298cfe496636a93853d6e94e
+EBUILD execnet-1.7.1-r1.ebuild 1186 BLAKE2B 9ca86c306dbd9220bc508d084cf867525f090833a83361d08faf15d0986d0b97df01db28b5f74d1229e2e3a13dcb06fe645a48547e643879ab1da0ac8ef73a8b SHA512 04ace51765f7439d05fdffa0b3a32effb494abc8e6163bb81ab61242e791ff93a257913a7dfca8c37508e1b99bc75ff904e0d510f1ecc37a09dcf40ed738b0be
+MISC metadata.xml 441 BLAKE2B be64fae1f1acc10cff3492e6c2cd802f9f3bee83d646868d3dbe2336b35c791f8ec0be4aad6e89aaad167f03163740cdde543c5af6dc71c0780754f97a76f4af SHA512 9f17e1724f03b55e0313dd4b7528ef1f190258bd39efe35e144ad1807f4037a08e4302f749153f511c1bd0ab01a885e3700eb3ead4764d44161c0f7080a55673
diff --git a/dev-python/execnet/execnet-1.7.1-r1.ebuild b/dev-python/execnet/execnet-1.7.1-r1.ebuild
index 8e07edf078a2..1ae21952a2bb 100644
--- a/dev-python/execnet/execnet-1.7.1-r1.ebuild
+++ b/dev-python/execnet/execnet-1.7.1-r1.ebuild
@@ -14,7 +14,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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/execnet/metadata.xml b/dev-python/execnet/metadata.xml
index 8c51d7adc02c..79814a5e8f8b 100644
--- a/dev-python/execnet/metadata.xml
+++ b/dev-python/execnet/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">execnet</remote-id>
 	</upstream>
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 577d77298152..4899502ab08a 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r2.ebuild 864 BLAKE2B 94c071bcf6bf5546d361f4fd3bdfd95fb76d1ecb1aad1473942603175295c7ef32a15499376034f71499099f069c0cb7d479463d163dc88189f8bc2adf327197 SHA512 28845f022afed78238cd27a7bf64f1d74d6ea1d2aee1ef060ced84d037ecac8d5a6c53943c9857aab89b634710affdb9dc8a1f85683a0f3d7c6a7a55fcef8a0c
-MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
+EBUILD fields-5.0.0-r2.ebuild 875 BLAKE2B d500a0b8b30ce82cc2e9b16f70abbbc1c4a41e5b6fcb3aff9b18e770415f25d8240f36b87b6c8bf715adb2f20b332405bf03e824b4ad408ebef05913030c0226 SHA512 1de1a21a520caa5b508009970a9fa98e69e1b1b5a75e1eb32431b10db4c1a24c8a54aa5c634eb5f680bdd415b09fd642edae9d0144aeb83d450f8e4eccf308e5
+MISC metadata.xml 361 BLAKE2B 611ac98563da8aa9d43f8a5a3e1317c96f4098803d80235bceade270c526b89c62ca3bbca8bed095a504024ddfa00be570ba8b54daea8ff1bb7d109540baf6a0 SHA512 47819e00388927636ac00892661f0f5b71101ae081cdf29bfbbffbde24a5efb3ad339130a8bf97116591552be630902c4a003a98f3202f81e2bf7a81f1fefa47
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
index c20e1053d872..f16a9016bfc1 100644
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-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 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/fields/metadata.xml b/dev-python/fields/metadata.xml
index 8e8da838d640..4391ab4e39cb 100644
--- a/dev-python/fields/metadata.xml
+++ b/dev-python/fields/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">ionelmc/python-fields</remote-id>
   </upstream>
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 11f49e8124cc..d3389c5002e9 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,3 +1,3 @@
 DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e697d5a710b87eb2f0ea0cf66f554b90bda2e95754b82e1544e45d0abd8dea861f52cdf9c7de0f1e91a8f5c8e0f9759c SHA512 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683
-EBUILD filelock-3.0.12-r1.ebuild 619 BLAKE2B 649e9ff466ec70380d284681cfafcb9a8eb4293351b218b32fb49f9277f37b98748b3e2362fafef10fb6cb42f5f1a2db6b106ba9e20565020995a3dd15a6dbc7 SHA512 e25af9e5fbf441ca3d0a1fe39af094f2b04a68483d93f5afa1cd460d56a5ce54fa41d20aa0a22b9c3b8a5df6c851207dcdf6f5f723a289b4fa8c76533b26af0d
-MISC metadata.xml 356 BLAKE2B 795142cf645edcb80e9a087e62fadbab50c5db359946ec290dc0c0b1c4ae12a666a0dbba4b2212a27310339c783f0c13e0a28a42df45a4cc9e781674d9514fc2 SHA512 3617ad60e67b84ce0d36bb1caef8a6b1dfac31d487ead4887b70f575726974b27d73208cc8ca0039a2334c6deb6609cf8ed85c8404c6b3a4efe0ad7bbc69507a
+EBUILD filelock-3.0.12-r1.ebuild 630 BLAKE2B 1dc38245f1131675c83f921d95e9abf75f0c4b8ccbb922f212ac62d06ce04135cae584a2a2b14b0b8d8310e63d4ea8b8b15d341a2dc546726d040bd56b0311d2 SHA512 c174565c964875977dc31f18776620d8c86d64c5450fe8644d2f6f4cc0056edff336ecb485e95e362b412939f7ec728a642039757d86a0200287efe82653985b
+MISC metadata.xml 380 BLAKE2B 24bd8ce3147524d0dfa757c9ea5aa3d5cce58bf31072cccc5390408439654631a016f17b1273d8110db978e5ffbc80fa4187230999ff7ff80c01835d0c63f9bb SHA512 b0d1d979278459dbc994176d6ff66c3f8490235046d2bd1356494b982ed881acf0f0d56ad16cfcbd5d5cb6b7167fd96dfd631507a49c3ccf67ee011b9d9f5c7f
diff --git a/dev-python/filelock/filelock-3.0.12-r1.ebuild b/dev-python/filelock/filelock-3.0.12-r1.ebuild
index 854abd2c0a6c..98a771a362f0 100644
--- a/dev-python/filelock/filelock-3.0.12-r1.ebuild
+++ b/dev-python/filelock/filelock-3.0.12-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 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 ~x64-macos"
 IUSE=""
 
 distutils_enable_tests unittest
diff --git a/dev-python/filelock/metadata.xml b/dev-python/filelock/metadata.xml
index 8684444c6ace..22c78f42e916 100644
--- a/dev-python/filelock/metadata.xml
+++ b/dev-python/filelock/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">filelock</remote-id>
 		<remote-id type="github">benediktschmitt/py-filelock</remote-id>
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index c1acb886a35b..162186618e6c 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -2,5 +2,5 @@ AUX flake8-3.8.3-pytest6.patch 1883 BLAKE2B bd4eb8f184636bfbc33b262df8c5612402a1
 DIST flake8-3.8.1.tar.gz 157166 BLAKE2B cc8b2dc11f78a6b9c62662086cc190a29a0a4e5a228d4823de8e2f3f327cea3e5df4db220faf9cc14fa34e3825b7d1e4fc4ccf9d1205b437903f327f3ebfa7bb SHA512 f73a306be7d8e5bc48dd9d6d8f8cdee07a90c6c38ee7bd37a21f4be23f1812e4a1e214cc75ca1a324f40e750312b5d7ed573ff49d673f9a1f33aad188b108add
 DIST flake8-3.8.3.tar.gz 162305 BLAKE2B 7211c9ff99ce2e8e3094e6a7a1917ee1b3d61902a45408b9c84f077097af8d1b0571e27209ed78409c9931ff53fdb660f81d1886773b8ef74ceb0bd3de60420c SHA512 007158ea5caf60ff84e935f1b74a5f746fba00991c8808395ff72126dc1a8c8e135badc6f1f383027349076b8f3e146e9d0af27b6e24cdf97390463fd69ad940
 EBUILD flake8-3.8.1.ebuild 1370 BLAKE2B dea3b7d66efcbb3097ac81e75cd0d76910ea424fee8017e7ae9cde2804858da1f0476a422403b00b17d476eba997afe96b393fd119d25d209ff2e43b72a337f4 SHA512 ea4e8d513f18033b12ee674a16328d41dad86590706623987c379871249b54ffb2527bca1ef0a8a5c5ff661655cef6a7cc9113573d2d4d498472de9568c1a9bf
-EBUILD flake8-3.8.3-r1.ebuild 1363 BLAKE2B c9e8b94f7f0c3b5b6a316f7e02003d8dafae26067aa8d1b56d51a625023a98be25469272acca71816e21a7a51dee6a3d9c2352196d5ca0bd22714ae51d5c2d0c SHA512 3cf0861ba2c5f99700d421425dab7d087a398f136379ad406c4e67d346b26f9f62c4fe0ec016d954843b110608b657e30b1e3f48705232e89e89039eb7877a70
+EBUILD flake8-3.8.3-r1.ebuild 1374 BLAKE2B a438c019c4bb40f6ab77ea264fe5ac3f25326b907e5570f1639e42c73f29dd5271df3e50113c05f5b40d7eaebf189bb1dbf8f41915e35b50d01f8f89980ea6fc SHA512 22b97188d716bc35c01f5fc67e1eea63fae685a6aee48a5873ac4e79d55018bf6cb9daabe151a27ed051f334130708597b64861eee0877386dd006c35c741907
 MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/flake8-3.8.3-r1.ebuild b/dev-python/flake8/flake8-3.8.3-r1.ebuild
index 7f9df80e88f1..55e6d64f8d8d 100644
--- a/dev-python/flake8/flake8-3.8.3-r1.ebuild
+++ b/dev-python/flake8/flake8-3.8.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index fca9b4975d91..73edcb85cf5c 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,3 +1,3 @@
 DIST flaky-3.7.0.tar.gz 29591 BLAKE2B 747fbda71055bba937abf3e7b97691c1f4b222f085069d1815d5a9eba669464d2ed5d6dcf1842ae82f1970de5cd5e3aea5b12476bfa2d9282549ad0cc62901e9 SHA512 b399f6e1323d6ca341803ac6f1eb318bf24dc37182d0b49b89bb81b9466dd36271ad6dbb9f48ea6fa4760ee631f1482bb6f49c64f4d4520c40634089c1b64f9a
-EBUILD flaky-3.7.0-r1.ebuild 1271 BLAKE2B aceb1f4e015dc376633073ea2e493a952c4b4d319930ba7f127f135ea7762f6184f560dcf60ade886dc87683096e531385511a343c85b88798d007d246edf97d SHA512 98f802f5279d66ef67a43f65983965241f495be0a5181c6290e8e57010682f691618acfd783729357777da22e3d580c99c733b8a3e96ea0f954042b94ed03a00
+EBUILD flaky-3.7.0-r1.ebuild 1282 BLAKE2B a43b3bbb3122cc0f9cde411095a3fb318cf59e7455539a4940ca9acd8b40185ad58e33f51eb32c1a456f3824632ad35391c9d226ff2ae2d1d32da2a1e01cf299 SHA512 3d5e2602a8ffb7148e992e61369759f8b7dc0f2bb6e6d176d65038f5eeb756707ca6b3a9cfa1b8585f3613bced60361833b13cdc8794669ecabf3b4cbd02ef97
 MISC metadata.xml 394 BLAKE2B 53dd53a5d469ac917564b6e476bd9dc3ad0db1d5deae6070233427dc2429e233bc9ee800fce0ec5c1a00eeb399d942287e2bb7acb2267abc8fc0541a08596b4c SHA512 cf363a14b16277e1bd3af50ae9827103ea16f901489b7b2d8729729e98dc09e0a05f91298e82054e5a58d042b0beeb844a80ee5a4ca2e28e9852fa7f5b7fc652
diff --git a/dev-python/flaky/flaky-3.7.0-r1.ebuild b/dev-python/flaky/flaky-3.7.0-r1.ebuild
index 0e9189fca9d4..b169ea605a74 100644
--- a/dev-python/flaky/flaky-3.7.0-r1.ebuild
+++ b/dev-python/flaky/flaky-3.7.0-r1.ebuild
@@ -14,7 +14,7 @@ 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 1f4e947f4e32..6250460c6922 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,4 +1,4 @@
 DIST Flask-1.1.2.tar.gz 637516 BLAKE2B 90dffbb8faa48489d1c71ff2a064d41e97d2103c07532fd5b252dbe0b32e4babb815e31f0ceae201a66cead645b68149d13d4bb39a0df1b27b4002e613920493 SHA512 9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384
-EBUILD flask-1.1.2-r1.ebuild 1327 BLAKE2B 5660a55f7b7e05da677a7c2acfae524be9ce2752806b259c2c477cfc0c1b8ae9a6991f5b01cab217622c469320e1b377e7b0c26b2c374f4ee4aa1e934660bd8e SHA512 a2a75b8a5d939ff1447ef31ffc63298d1ab0f57864647612ce3cc01d2ef5914b257b6bdd409bf0c2c4474664c01b96df362645fe94ab6f2c2efad8e4f3d91d54
+EBUILD flask-1.1.2-r1.ebuild 1338 BLAKE2B e89b99344478ead8b68c72944fa1fc9f540124478cddfaf0249c5abca486cf7294d859a05b11b9ec907be5b9c377a06ca64aae23c1c9300660bc35e0bf8e7e77 SHA512 676f300d5b22098c7904f8aa36d06e3d7fcfe4ad127f5cee4cd983a2000bb6f3b866f7fd5279b03e16c62817bc2f7d4866723c417fe9a14d23e9e8c737a76a89
 EBUILD flask-9999.ebuild 1296 BLAKE2B 91a4a57d017a9b898be3999456cb017564aed62c1dd0ec0eb44f9b1d6782fe94417b4130bd175c3e16927b6cd5699c71860dde9afd58446dddce28305dbd3da3 SHA512 ef2e1d1126f0be3df197913a356a698448cb38e0ab9c179c867f2a1c81fcbfede1af8f938156c5778c1273aa619c0c9d77abfb5e264b5fd90816be25799fa2d6
 MISC metadata.xml 387 BLAKE2B 32096cb4f4a2e7b3e484224a6253f7f0ee52d73b9419c8ea3f76aca7d782408fdf2917ef1797057b32d1dffb17522d23cc26011fdde938d9a47046d0e9794769 SHA512 f70179503fe0651fe6ff288731f10821cce3b19d020c3817db2f6d846f66d5f013f52c168d75e3fec8070b19bdbd9c3b08670d56d8aa6158ba3547a70ae39b84
diff --git a/dev-python/flask/flask-1.1.2-r1.ebuild b/dev-python/flask/flask-1.1.2-r1.ebuild
index d2f498c7fbe3..1361f1392f34 100644
--- a/dev-python/flask/flask-1.1.2-r1.ebuild
+++ b/dev-python/flask/flask-1.1.2-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	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 ~x64-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
index bdbb9cb5746d..a4a3c1e8725f 100644
--- a/dev-python/genty/Manifest
+++ b/dev-python/genty/Manifest
@@ -1,3 +1,3 @@
 DIST genty-1.3.2.tar.gz 20818 BLAKE2B a3344869e63f4f6e564836fdcf5e36b3184f5df2a20994ded3a20ee0ff1360ea5e9db574bf6097f5b47673fc7db70bb9bfd3238075fb0a3b7b722a6461f09632 SHA512 cfe984dfe5af48ba9f4f959a1d0ab1d331d3c2fdb64c680572e5652b845e5c290097ec3ed2b4e472a563cd6ab79489124f6eb212902a05a2f1ce5ff254a82e13
-EBUILD genty-1.3.2-r1.ebuild 645 BLAKE2B e6ff97da2c30d39191fca9d943705f61c0dc71fc42fc457b77e86a4092e69508370610b0ad052db0464d2063d7578089534c787d4b382d86ff628e85174a8852 SHA512 ceb0fdac3dc06f2f401e27862e93d59259c8ce0e38417050204c02e39e26d192914eadcfdd94c4dbe6845a404eada4a81b3abaa5914ade4f2db0135a9f9a31e6
-MISC metadata.xml 357 BLAKE2B c4b7d3382dabce66ab01fecd442eb82e979d27434b0888c06d75d138ced20b984c67367f632a9fe00602d8d385f2222af1e195b8cb5e8b8b7e50494b9b018627 SHA512 ba3b3f11913ffc8848a7d2b1637b028812badef52306565f5d0462314d97ddb5795219cc6f674f3dfdc47c3d9b0bce602425b25df99c7227dcc166f1b1f536a0
+EBUILD genty-1.3.2-r1.ebuild 656 BLAKE2B 054f4e2d5a14f79a0e8c22f2eff967f1d46f681caf727825f43c58521194a9ccdc2748db47d5d389820545769c9c47696c3e2ed72b60aa916d5bbf59983c7634 SHA512 efc7d27fc3b2ced4f24b9393f49999d126b32253d8c804ddac8a59c92a311c3891570a5a21a30fa70a138381a7359de9cb76cdebbfece66dbc66acb9297d9d6a
+MISC metadata.xml 381 BLAKE2B 09028f02ea8462c771a82ac8c210bac1d37fefa518bfe6151488b09ea318280088bf85ed0863e8132195ba2e910e8472ba6f8d9e89d8c740dce29267afc8bc0f SHA512 6346305d67e254c8296b6f0344ca5696e42df51ee282c467fa3a19a2a89f92aad1bff1a756e7ccedbd600df749e18c8a52e5dca2b7b5e268fdd463670880b7f4
diff --git a/dev-python/genty/genty-1.3.2-r1.ebuild b/dev-python/genty/genty-1.3.2-r1.ebuild
index fb5597c17e31..194feeda5ebd 100644
--- a/dev-python/genty/genty-1.3.2-r1.ebuild
+++ b/dev-python/genty/genty-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ 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 ~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 ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/genty/metadata.xml b/dev-python/genty/metadata.xml
index 975b996b7900..f2d792ccb891 100644
--- a/dev-python/genty/metadata.xml
+++ b/dev-python/genty/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">box/genty</remote-id>
 		<remote-id type="pypi">genty</remote-id>
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index e66167d2086c..8ebd40b400bc 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,3 +1,3 @@
 DIST gevent-20.9.0.tar.gz 5806581 BLAKE2B 6b1b653fa6e22539e049a9bba3d3a2b9d798a5555ce4ba60ce33ecbdf14bb5201967d22d677e1ce3170129b0763fddfcc5991347186fb102d10ae39e22538c44 SHA512 966efc945b623df2521fffadca3b7e56cae1efe6de904a724765e0593389e8b1305094baa6fbc9f4fa376b1157d0f230b01e2a90de21e4b9650614363edec9f4
-EBUILD gevent-20.9.0.ebuild 2174 BLAKE2B a19d463b457fa971e376c57f1331648e409e7459a5d6709f859b5563eefd32f2eacf0a21e958af6b0b3b7c68f718509e64ca4a4cc51227b7c4fe6f4af723a120 SHA512 5023a2301b9b049112840d62642fa577fddd370ed6f32e648e70f06b2a8d0d30c2efeef869c8907df40061e529736cde5f7813296d7b81ee43ffc53f8ddf7d19
+EBUILD gevent-20.9.0.ebuild 2185 BLAKE2B baf4a4a230dfb8d5f46c106521c86d2a7a873281a0fcc62d7cf80060e58ae6124659b9b78ca9f3d5f1608140e2936e95a51ccb9f210c4b573e33fba60838aa1d SHA512 dd18cc4a31ee8d3d28c84c8e5c93c69168c6fc060c55441919b8c0b481e9589e89eaabeb3a4446a2b37ed0b6fa6cbef3493bab4293f69dd87c412b8e0cf22eb9
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-20.9.0.ebuild b/dev-python/gevent/gevent-20.9.0.ebuild
index 02832ebf0ba2..0e56fd671801 100644
--- a/dev-python/gevent/gevent-20.9.0.ebuild
+++ b/dev-python/gevent/gevent-20.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 18f4ae868bc2..cd9bde9c09d6 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,5 +1,5 @@
 AUX gmpy-2.0.8-fix-mpir-types.patch 636 BLAKE2B 3f9a73390cab39ac02c9cdbf6c78381a14e861b15c4e0194e9727b3e801817111b6ece399a2479c0880f84d542816b2e388ad15e8f9786e2ab63b5e893f31cc1 SHA512 701e985b1d8f1d3ed0efa48a9ee225bfb9a06f5a19f53a8a1ec6c525e74fb2b6fd006f1bba28188926f77faec6cbc456985b810b7c774aef1699a0ab2c07896d
 AUX gmpy-2.0.8-test-exit-status.patch 1482 BLAKE2B 5fce4170ce1993cf7e44077b81ecf45b4c8d3b779cb8744c6deef6444cc728a4cf7831aac0cc31a0b6315518bead442ce232e0052e72229f397691c21afb5890 SHA512 bbb708c0323167cf86c60ef6d398a588adc9a7ccc96eb1cee9d36c38b34c69c896a7df99f50611b29ba6ccb79f77408d274074bd4878e86b8f3bfc38675b74d6
 DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
-EBUILD gmpy-2.0.8-r2.ebuild 1706 BLAKE2B b0756c9a331f529e4f253705f57727aca47fcf6cc8ed68e2074dfd08308ecb66edae444a62814bb61f6f61ea71e6758113f64bd52e169a0900a5ff597c8d3004 SHA512 1169902aecec0988bf206741b4bf3e037bac29cf1a29b58a3dfa8033453623b8feaa6b6914d9a89119df875f06d8ab155c2860d7e8688c2d83a9ade9e78f7e08
+EBUILD gmpy-2.0.8-r2.ebuild 1717 BLAKE2B ffc9bd5fe3824a5cc34158d48f9dbf0c79e24b90d7f59d6c8ab69739ab7989c96bf8f2f74626dbc334101948839ff854abbec2c4df5098665a8dc0961f431d95 SHA512 cbf168a9b2f6a93f79966692c48d677a5f256a43728bcb6ecc19c1e93af3f3ac629cc9ab1c55c49692985390e7c3c366d8679a1b300e755b7863fc3c65224cdc
 MISC metadata.xml 795 BLAKE2B df987c466b2666db915c405dea507c17f90181c2e2948885292a6de44ba0c4bec640fe25bea3b8b8105d035c3ff999750b747cfd7f4caaab561f459056823eb5 SHA512 e7f8324cdacceed22f28e27a224668f59955fb5a639d26376da037b0d21437ef57708c7c325e00c771df9e11050be8dc423a3d4b631599da2cc1ef3f97cf3795
diff --git a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild b/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
index 2d7a3c1b25c8..ed2b612ae66c 100644
--- a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="mpir"
 
 RDEPEND="
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 211a06bcdc92..df5e9203162e 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,3 +1,3 @@
 DIST greenlet-0.4.17.tar.gz 61381 BLAKE2B fd5b8ed72acd390f3d5fe3ca1d5894bc47278b1f0e04e4fe5c6015c60dfb3109e766dc6072bf85b96760f673a1af08cd546171906800a1221a216899077a908e SHA512 41afd80a6cd5e9cf9c8149016f24d0944d2651288d50094ef04bb6759202903c436af639872d7aab631ed8fe13aad7d4405beb428415b198a3ba30a96d4bd3de
-EBUILD greenlet-0.4.17.ebuild 920 BLAKE2B 5bb0e15db21204ecd515a259cd8b7bf44c69ed2702473245621c961dfbce86fb6f0b5a165d59efc8fed93a36c5d4a54c8d38a60a0292997833e29fb458c1a0bb SHA512 56007eeed40cafd401125388db3875ba4a149be85951c59e04f413c348adc2e83a7c8b4341eadc95d5c3d473aecfe5acb8751028239a08a79a11a15880e5e3f8
+EBUILD greenlet-0.4.17.ebuild 931 BLAKE2B a2c41e695b3f0015dc839230f12f1b7d597b736772823d3b88333b5c3583b0e21fb995bf3273c551f0255cf8948aa2ef248c95730ee6c869521b23a249ca0ea4 SHA512 001322397287fc8cd64474fc2abe432e6e7ca6d42cc20a0ea27181ae90d503fd3c40112d08cdb394507a7aeb6ff2a4cad585d8e040373ef72177560f44c1fdb1
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.17.ebuild b/dev-python/greenlet/greenlet-0.4.17.ebuild
index 8a1c0289d6a9..2aee994691cb 100644
--- a/dev-python/greenlet/greenlet-0.4.17.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.17.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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 ~x64-macos"
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 142bb40d54c2..340a0eb58f80 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,5 +1,5 @@
 AUX httpbin-0.7.0-optional-raven.patch 841 BLAKE2B bdf8cd94706b08d6706349ad471212fbda7f78e7125378073e4db43af352b26778706b2c61ca51f6c1c44aae4fd250432793e0ffef463102324ed39069da20bd SHA512 757bbe80463b332571e9d6e2e3266d2db3df519a180a7d3840b6f4813c2373382519e322547feb522c59ec3893d4721e42463d8231b4f5904725b9547af407bd
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
-EBUILD httpbin-0.7.0-r1.ebuild 1071 BLAKE2B 2c5d3f63645f8999ec370e37d4cc94b017970849abd535d7adb2c635715becb77e30340a9f533e123baf456135f8afa8d2bb1554aadcd3b643b21d5bdb359c34 SHA512 a3c294a97439c181e291b469cfc67bea6600e18620c0c99bb88e0b0d05b6dea87b9a5e2b2f6c32ff4d4156c870a42fa15d7eacb1a66b6324bf6f3ee716cf494a
-MISC metadata.xml 500 BLAKE2B 1270abbd84e19a72d75a2955858c49c6b33a8c92da7f86fb7853fde55968a840d941fe9f7cd1ec2718e8cbcfede6166c412aac7fc40e483043330935720dd898 SHA512 014a5e115d2cd225618e78ddf226dfe4f8772815efc3e9ecf49883701127335d9cba5e216daaba3f15de2944074c0041e5fd6eaf26772f0892da891570f841e1
+EBUILD httpbin-0.7.0-r1.ebuild 1082 BLAKE2B 63b7219c6e200fa6e846f38d337c54838f3cb1438f89d2976332bdce5172d25b348a9b8df3391df8ff74d19696623745de99e8d73978e64e0f612f68e9c34fe5 SHA512 dc27b9cdcd2a7004e5a84b401540b2a4fdd4bf91e4bfa4dfe7a5dd5ec7d5a2841c6a3ce195d4b1117c558acb1d7c3a898a8373101bf3e058e11d1698d173aff8
+MISC metadata.xml 525 BLAKE2B aece3687c440aa7ad57ca9190e68fc3ee5deffdd79c1c20cb04333c64846273590e3ef3f0c2c5adf8db014b2f15281353cae4b8b9dcfbacca895714cef911441 SHA512 d3d076dd201fe1c920d4b753999bb20bce792e266a5b9d035128a8718be819642acb6141640857b6d740222a839d5a995b0f3346f48c78f0276a5cdfef702bd7
diff --git a/dev-python/httpbin/httpbin-0.7.0-r1.ebuild b/dev-python/httpbin/httpbin-0.7.0-r1.ebuild
index 873be95a1f5f..f0eb17a2b42c 100644
--- a/dev-python/httpbin/httpbin-0.7.0-r1.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 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 ~x64-macos"
 
 RDEPEND="
 	dev-python/brotlipy[${PYTHON_USEDEP}]
diff --git a/dev-python/httpbin/metadata.xml b/dev-python/httpbin/metadata.xml
index abe8d7d98c04..0c31c1889018 100644
--- a/dev-python/httpbin/metadata.xml
+++ b/dev-python/httpbin/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">httpbin</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 91753c10b720..60e268ad9999 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,3 +1,3 @@
 DIST hyperlink-20.0.1.tar.gz 140291 BLAKE2B ee8c741d4cb87e4a577e1c9a45614f5f47e086f27b60a75897b66684ab5927da73ccaba47b16b770f0277a52351cc732cf74762e29c83644c220ed59c67a18d0 SHA512 f935c09d35baf8a8a3c8d4dc6aaf64135d13dda4636187f5d47f3fe4de675498efa29cd93d802c0912db2fa371d0e58213767b1c3c42e5a14bb837ea96a72193
-EBUILD hyperlink-20.0.1.ebuild 668 BLAKE2B 9f518497d436bb1532b5ad5e83bf07832cf4b4b71c7b9f54788face3df46483ffcfad558c863b256997b3a59548d4b908021c6872ce07720f677080435bb3378 SHA512 cb0edd11afd2afe5676596645d995ed82580e7ec32e6efc35757301cf699e710f4e4ce18449aa37991b9c09b83d67a6cd3f4587e471bb2dadd90fd3fe4c3e598
+EBUILD hyperlink-20.0.1.ebuild 679 BLAKE2B 80b69f545a6f258d0eb070292bc5fe40e798d5ee37864bf82edbe49b69c3be88eda2e7155c5e3cf0568c5a45cc6b8d1d24f5648ae92e6d401aba6e97f83333bb SHA512 3a6873bb96a52c491da05afc75bab9444333d0deb97e0d8b3985a8600834b85463fc5bfd2235794bfa91b65714ec3890d29be7cf6fd1d49e63583753c3922a42
 MISC metadata.xml 697 BLAKE2B c5362a0a1a73b8f1d2675539ceb6c13199ac14dc6365b46f268799dbac155b03a0dab0e9302e61e6ca5ce5f2e7ae58be9806f8664c117c430bb52732bf8db927 SHA512 3811b8d737d1531e1355622dd939430085e5e672bdfe36450893f46b84441fd009ba60eb46a9cef4472688070a007e1c78b2b67794eb7d5b2ef8acff2bd801f8
diff --git a/dev-python/hyperlink/hyperlink-20.0.1.ebuild b/dev-python/hyperlink/hyperlink-20.0.1.ebuild
index d228def6b469..b4be7b18edf5 100644
--- a/dev-python/hyperlink/hyperlink-20.0.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-20.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 436b14413c67..a9694778accd 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -6,6 +6,7 @@ DIST hypothesis-python-5.41.0.tar.gz 9094817 BLAKE2B 3025caf9a0ccba19abfd12273ed
 DIST hypothesis-python-5.41.1.tar.gz 9095771 BLAKE2B 29c5c091f4b827d1f1e6276d0401c1a673077304b3ee8b0252536c3eeda066a4cfa764856edb222ba6cbaebb424b08aebc8d8ec00c5e0d445774b1c62ed98593 SHA512 b1f02e32e6c5bdb6ca0a338901715508a03d2734898c673c5b3a5b25dee34922d7fbfcc2534b0c658d003d5de3e97abecb5a9b4f00ada0cc85c457b4b870a873
 DIST hypothesis-python-5.41.2.tar.gz 9095799 BLAKE2B c1743f2e9872cefdd82dd79b60f78ae02bb975be2156bf7c05054627ca8386092588721450dfe14954129e46ea3556b78f7784102640d84368bdc98af2980b04 SHA512 712a6b3a007e4b354e9ed2137b7dd53652abbbf0b324467ce540ca886fb956eae5d00f83cbc1c9b1799a4a3abc64f4d26d9aed85d5fb689e904e1125b87b88eb
 DIST hypothesis-python-5.41.3.tar.gz 9095982 BLAKE2B 3a1b7052b3f71d1f8139101d16f2f74c2d434514a201b7e04e5452ac2c5fbe7288d592c0020769f3a48f73347cdce53f507ab65db7bfb4f3823d0f7997e48058 SHA512 974dee6040222fa55729257cea4e3c4c049625a2a5dfddbc12667dbd58dfe31718474ce8e9de81519e998c7a0c8ff01920e0aa2bca9fb7100754e985177f4b69
+DIST hypothesis-python-5.41.4.tar.gz 9098296 BLAKE2B ef471172039251129d03faea722fc190135ed3d2e94a9bc6d4ad4f9676bc819e641dd0c893352168425ce987128e73d8844f622e57a7c161d33f75ea0f4b7312 SHA512 215f2e4479eca10d8ca590ffe0623f8994c7061fddabfe2737d0f3bba2f403042ad8e75730361417a1c9c32d3e261c8daa84032f6963ef6526e6b0067a156658
 EBUILD hypothesis-5.24.4.ebuild 1608 BLAKE2B c52cd842682347491245d4560fba737a85f8dd46e93416047c2bff5ff4dcde85bd337d7e7c65556e61d97bb1c2a1270652bf3dec8126049daa01215ed1424b3f SHA512 7d3450fa374c88dd6206663341a1437d177a7cfe5b0eb99161a85f4e62b97020843e052d28ae0975628d8c299655a35b86ba51cf67bacd296e839d949c06f785
 EBUILD hypothesis-5.35.4.ebuild 1792 BLAKE2B cea3034afb7d809f5c3f8dffd5ef2ad6ded44eeff4e6921318db421e9975ac78c13d9add11a717d678799e4395937a3b3cf8e8f7929d18161c5d452b8f5605ea SHA512 4acec6c9774186c35189baefabfb84d50a4b0a4f94de83b6e6b561cfad3b325c78f4957bc9045460edd985cf0375602938d276e5c73ab1803aea48d0f021b191
 EBUILD hypothesis-5.36.2.ebuild 1801 BLAKE2B 2353fac773dc0ae13f54d9c87645444b4418a7dab698376bbf674ddf01f93f97956af09d314a92f74d716192f1d10657bcdaa885ffaceb22aeead5d1c0c55d22 SHA512 84664f8ab5c91863d349e8e77c39d7b5afac420b9cb35488ea032530bbeb81f1b3d568b74e6c6784555aef71652414e3709a308e76f36d1d3dd05188cc0bea75
@@ -13,5 +14,6 @@ EBUILD hypothesis-5.37.5.ebuild 1920 BLAKE2B 75a8070d9cc3fffa31a5c854b3784b9fc25
 EBUILD hypothesis-5.41.0.ebuild 1803 BLAKE2B 04eac62c585b02bf721763309619d61eec9d526f332323daabe73e8a9829bbf6c2939baf751a196cae120134dfe68bde39e1567795ad5668cc718489e2a3e3f4 SHA512 0ff2d839e09d54bf1ec046f1de9cd29a13ba75d57ea6334a4aa812fba61b15e805596e92ca9a825ae482cd6528e94115bb4cc92e1a5439e691f4e23ff961f7ff
 EBUILD hypothesis-5.41.1.ebuild 1803 BLAKE2B 04eac62c585b02bf721763309619d61eec9d526f332323daabe73e8a9829bbf6c2939baf751a196cae120134dfe68bde39e1567795ad5668cc718489e2a3e3f4 SHA512 0ff2d839e09d54bf1ec046f1de9cd29a13ba75d57ea6334a4aa812fba61b15e805596e92ca9a825ae482cd6528e94115bb4cc92e1a5439e691f4e23ff961f7ff
 EBUILD hypothesis-5.41.2.ebuild 1803 BLAKE2B 04eac62c585b02bf721763309619d61eec9d526f332323daabe73e8a9829bbf6c2939baf751a196cae120134dfe68bde39e1567795ad5668cc718489e2a3e3f4 SHA512 0ff2d839e09d54bf1ec046f1de9cd29a13ba75d57ea6334a4aa812fba61b15e805596e92ca9a825ae482cd6528e94115bb4cc92e1a5439e691f4e23ff961f7ff
-EBUILD hypothesis-5.41.3.ebuild 1927 BLAKE2B 4bdf87c00ea830b0042d5e5ba1fcfc8842638bc6b2063100965ebd013d998034dad5cade6f00e2a0dcf55070a50c06022b052542b3dc733dd177873d962a336a SHA512 5d2a150e11744ce0b5a3aa009f760d4aa2a15349b8416b027d69a04e0b79f7db44a38b8074cf0889542e0e6250812d2ac727f6586c33c3f2778cf6c1f4cb13dc
+EBUILD hypothesis-5.41.3.ebuild 1944 BLAKE2B 72798f2e7d9f5c52c18d9f5628288deadbb2929cb81ce1ab260a6c310bb0a1f081f6f7bf057bc6c7b764ff4294d6c4b8631a352e10fa556d070f0ca1154c357c SHA512 87d5198bc9245a8d971ec781269090288b3e4a86318675fd2d28905e7f97eec43d3e493fcd1a06a1e38bff3807f776cf5b4681e1e14daf4eca862e953512d8b8
+EBUILD hypothesis-5.41.4.ebuild 1944 BLAKE2B 72798f2e7d9f5c52c18d9f5628288deadbb2929cb81ce1ab260a6c310bb0a1f081f6f7bf057bc6c7b764ff4294d6c4b8631a352e10fa556d070f0ca1154c357c SHA512 87d5198bc9245a8d971ec781269090288b3e4a86318675fd2d28905e7f97eec43d3e493fcd1a06a1e38bff3807f776cf5b4681e1e14daf4eca862e953512d8b8
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-5.41.3.ebuild b/dev-python/hypothesis/hypothesis-5.41.3.ebuild
index a3cf894856ae..30e83a217730 100644
--- a/dev-python/hypothesis/hypothesis-5.41.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.41.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.41.4.ebuild b/dev-python/hypothesis/hypothesis-5.41.4.ebuild
new file mode 100644
index 000000000000..30e83a217730
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.41.4.ebuild
@@ -0,0 +1,68 @@
+# 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_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+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_{6..9})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH="${BUILD_DIR}/install/lib"
+	esetup.py install \
+		--root="${BUILD_DIR}/install" \
+		--install-lib=lib
+
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+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/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 8837ec94ee35..9eef194d249f 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -5,5 +5,5 @@ DIST importlib_metadata-3.1.0.tar.gz 29246 BLAKE2B 2144e10601e089e26e1d85269ed06
 EBUILD importlib_metadata-1.7.0-r2.ebuild 996 BLAKE2B 2e04af2cd739c2f896b5380dd73625c88cc76150bb8ad9ed1f73a71d253132e6afb272263dcb38383965f620e97696ec57eba41e72aed3673dd140a8e2411dd4 SHA512 1d5a62e708c34147dd3a25f77565c1ab4298ed0c0915f4c056cc7199edc854e2d86aff18dff6e5028ec3f03c03e697525d7c06470d0f68e652d3bb62e1152ad1
 EBUILD importlib_metadata-2.0.0.ebuild 1050 BLAKE2B 6657fb32eb94f02f06e5e09c75cf824278b45d8e9411da2eb5279dcc60c7a3be5018782380a44ac12e6c0421346815f0dcf2d9bfd2af38a57e5e5c842c98363f SHA512 990434854cc236cdf4eb6b44525007dd385985783d7e7387eb6c9d0dd0455c9afc152a30f51e932ad909fac3cb5e46c3b34b250705b5f86d1212255b35b6a5fa
 EBUILD importlib_metadata-3.0.0.ebuild 1005 BLAKE2B fb89a4c5ad0415927835120e6c7e5148f8bba72a4048f5190d00669c58f11309a0a2ed053bf4503a47bbf1d46cfea6cf5181f34f7304a475a0066e131d9bdbcb SHA512 7af82a4d41487d952ba44483db56e6e3e3693fa63c7f7f01fbf543999b7b86c496d845b467d82fcb1885d8350e0fded115c8864b8164d180eef6ad7326f877fe
-EBUILD importlib_metadata-3.1.0.ebuild 1005 BLAKE2B fb89a4c5ad0415927835120e6c7e5148f8bba72a4048f5190d00669c58f11309a0a2ed053bf4503a47bbf1d46cfea6cf5181f34f7304a475a0066e131d9bdbcb SHA512 7af82a4d41487d952ba44483db56e6e3e3693fa63c7f7f01fbf543999b7b86c496d845b467d82fcb1885d8350e0fded115c8864b8164d180eef6ad7326f877fe
+EBUILD importlib_metadata-3.1.0.ebuild 1016 BLAKE2B 59cf223d538c76d04291195d5c6af921dcce936eb936a168114ef20df8db04cd84eb2adf5e743d0d57d8095b87bc9e1e6fa4e1ef5acad670ec27e017a81880cd SHA512 7dbbd757b1c9ef77646cf095b4b42c03b1d397dea0cb74216b381c03870f9de536b529e8513d41b68def070ded09704530f20feef00724ef875a7c351362e9d7
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
index a04ab9b239dd..47bffcc15b52 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 1ee398bcfb55..3a524897a284 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,5 +1,5 @@
 DIST importlib_resources-1.5.0.tar.gz 23660 BLAKE2B aed7a2d730f945505083812355a63d3a88e07b057cf46394f3475135143e535e33dc3ebded24d233797020c805dc35decf5c5ce53758798b093f03f2951daa87 SHA512 34d14c1ff3121cc6f9ef1d3d4417831e3476e9facfcc9b35152c28a59a2c75d7723f171f4b48852f79ec46cbf54b066580745744bc54d349e2bfe12a353a9aed
 DIST importlib_resources-3.3.0.tar.gz 29000 BLAKE2B 5fb87c6e15f01733567fef060607da0625d32e415e294cfd5db94fb26e13d257763f2d3795c19ee7d10fc1fdc579fc0c34a484d28aff32c20553d18fafc7b850 SHA512 1fc03c9d141a094ca6ae0acb9ff0668a3f3aa76b47ce2149691b1d85d37a3ba9d329dbafd8b94961c537a4982cea1bd3ee34bac069819c51d725208f45b24172
 EBUILD importlib_resources-1.5.0-r2.ebuild 1274 BLAKE2B af0f9bd476e6cd42024080fc1ed465e2f546bc0d65fc400d0a3d5518216c503824ee52393b65bb6e50f23d3e6aec2ad0542ccea298e9c90dc7c4fdc6912e8d0e SHA512 91c50f9f545bbbc89faf1e217e8f20904c26ea8de9eb29ad7f5f1c508f32be44f027afda80c03b2b7f730f5c81bd9b1ee283d83995d43dedcf2357142957d455
-EBUILD importlib_resources-3.3.0.ebuild 825 BLAKE2B aa427b7a50a4ebe084d24751d61cf16dd5414800f1f72388ff7a1a9b050c24e967db3bd976bf369c69bbb1cd15915f56f60d69963528cc1303516ed43f0da0b2 SHA512 c47cea106bad1aa6ad2e289bc2de3fddc2fa5d0fb53bb802b4c2799d474baa864bea684c20433719b22044164edca37acaa76a5b5556f7a9d3586eb8ae70384c
-MISC metadata.xml 920 BLAKE2B 4831ad36ad148117665fa2ae6bd3e34ccd86b2a3a7d3ce1c3c7e36d61ffb9abd25c8a8943ed3bf708b69a9d4250a6f565cd1b228832c8b00fb54114e4a1f62e8 SHA512 3ed33c39bc2b8a4dca4e136ff7db6b92181bcc90b1c9979dc2e881855c52f414ef2ad2db6a6333fc377dbabff111ac9baff3ddedbcb6152a2bcffc4983d7cf26
+EBUILD importlib_resources-3.3.0.ebuild 836 BLAKE2B 71b9f7aa0465ffb0d797b007ab0f12fe7d9542415ad2aedcded20b3acd1f62605f6d375dcb85f09567df2c2ab1cd9d9dfd4526889c7f0ba88f789dd2c3a824a0 SHA512 d3d547d197dd043df177ec74dc2bb0a55802084750d1e6fba3d3371c3baed30719cf7c1380fd93d358aa682d191baf9617ae3863a25c54a551901060e325f3c4
+MISC metadata.xml 944 BLAKE2B 52ebb682ed9112241bca8983ab14b9454eddc904bcc04570b27eb67c32e94b405b8524b02f90bac2b3e31dc4245b8f6ad5fa3457008ea5232c0d9678c169a94e SHA512 2a68beb094a84287e7d09469b9abe736cc11243ba4056c63a9373e7d006390faa4988f437509d2a01a3b3522f57fd5ca10ae2b6114be31823dd4a96d4543117e
diff --git a/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild b/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
index 49e25f9954b1..b94ce8b4f431 100644
--- a/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-3.3.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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/importlib_resources/metadata.xml b/dev-python/importlib_resources/metadata.xml
index 45769af04132..30b99fb262cd 100644
--- a/dev-python/importlib_resources/metadata.xml
+++ b/dev-python/importlib_resources/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 		Backport of Python standard library importlib.resources module
 		for Python 2.7, and 3.4 through 3.8. Users of Python 3.9 and beyond
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index 46ed9b94990a..ed7680c62a72 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,3 +1,3 @@
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
-EBUILD incremental-17.5.0.ebuild 762 BLAKE2B f896e53d70b540f26a2dbf0db8ab36327820c2c85c50affb27d2b449f9a6f2c27673238ad9b68120e5321761c2603ad4612369a483763628a4742a5d79b5785f SHA512 3946102896dce62aaebc70cd66bb58fea4bf150c06e2774fefcfb96d519b326b861808f954597343d778d86db9842081bb97ff18b6c39400cd6be1edb7b2adcb
-MISC metadata.xml 476 BLAKE2B 854207bdc5352a730881f6f6a820bed4648e839e64601274f0c249e805bd8c1aad5066ee970f2f45e8c8cf532fd4f07ab0956ac8656da5e8947246fcdb618337 SHA512 603906b5876ed9cc69aadcaee6d9443d20a2d134939ac79a41ca23f8ef010563ba3f56c012219cabb812eab0eb7e6bdc19cbe7763cb406e948713e49f1bb13c2
+EBUILD incremental-17.5.0.ebuild 773 BLAKE2B 6700c78121e09fb0f5574396ba5abf16f8a4b0f576b72eb08158e4c9b3596f481cfc72e7836751d59da522c0767333c2a5dfe90a34af252318bbcb7ac16d2526 SHA512 220cbaef2255f8b0ac4f9a81b2be102c1d641d12e2d9a9fbf1f13ea7bd8899e1692ac71a29655be9ca77ed8802b2baacbb95c0d8142078d1f0bbf57755cd9643
+MISC metadata.xml 500 BLAKE2B 5bdd21b11ae3bc588f4391be9e08f0ac27f4f028ab8b86225eedc3504260a85ea8e89d443027efd25bd7c46e2fefe0c2f3cd2ce8cc2ce0bdc1f99c3ef6944af1 SHA512 ab126925cdce36ddb4b8b59c296d8e61172e281c9d2e1f45e17bfd174fd0e8563cc967a360898a23513be8cfe8515af2395e6e28f1bcffeda22a53d1df3a8c2a
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index f3d37dbbc21f..a9511bb0fe24 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/incremental/metadata.xml b/dev-python/incremental/metadata.xml
index 178cdb1dc9ea..c8770ab3e617 100644
--- a/dev-python/incremental/metadata.xml
+++ b/dev-python/incremental/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>hawkowl@twistedmatrix.com</email>
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 38f0ce0d919c..4e62deeff641 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,5 +1,5 @@
 DIST inflect-4.1.0.tar.gz 72200 BLAKE2B c15f6b0d5d93050283dfc4d691e9fdbc26bb2f71573d6b397834e87af62f3afb8f5cdb0448c531de37e84729c0c6ae0cf4ea7a7b081a9dd784f7c06b962d7def SHA512 9a2ba4777f01475390976f3ac28f046d39d1f86cfdafd161cc7c8d33526aca35d44e6598ccf2a0b68d3511a64b67ed0991b51c78bda8f279cd706fd29a3fa514
 DIST inflect-5.0.2.tar.gz 71323 BLAKE2B 42b2524b00a8b71aca6f164de9b57708be172ce63bc62480e951d082bd68f082ad2fadb502321a5fc97ffa3af95f26935d0de855144863b9bd1dfbdf3bdae516 SHA512 ea97ec4a4a1a94a6218e60c20d63e483026beb1901abe2fa69f186a823f8a786b9a82af231fc42bf705146f650fdbfa5ff660cfbe821eceb53891ef2e91eaec3
 EBUILD inflect-4.1.0.ebuild 1005 BLAKE2B 47027952c17e73fdbf15eeb872c29b9f0080e3da59d65e8738d04c9a3ed81c118013cbfb4d8dfee9560103f0866bec2eaf476c722d136a123b6c90dec9a0158c SHA512 ac507e143bb5dcd85148042d5d18e53799f034f7eaf0e671af17373c922928209577b1d8ed83136cad7a62e23f67fdd4da8eb1fbb49d9bd95f017932f56428d7
-EBUILD inflect-5.0.2.ebuild 847 BLAKE2B a2bad53098a1aae820b50c5e04b1f6bab713a7b9926a8b56d3cb9e93c6c6e32cca94ceb2a6c9ee63024ba0e88a5f4dfa5f3e7fd76c88958e53ebb6d7ad51240f SHA512 3cb6bf8510e7770c2d1179623ece7608aa3b904521c04774e34ec460c517bec92cdb9dcbce09ea900dcb06cb0c0a51bea17f7a63c919b32e174e48fa846f8a06
+EBUILD inflect-5.0.2.ebuild 858 BLAKE2B f7b935adcbd05b55b6396c180b93d5e1bef4162cf397fde9874193e040cebe8776792039d0bf35161bf457d0463be81ac883198d9b08cddf7fe48e9133de1b72 SHA512 17bced660ebd798c3226d6bb69b42e4cfc4d6d8c2cc9a8e22004c18d1cdfcd2e7bac2dca4f844650bc07be49b89dec78ca4882cd4e25a7a7e44b1e6e18d9a3af
 MISC metadata.xml 556 BLAKE2B fc273466492a4a7c43d631fa5ec3d7f0a4896f5d9da637334b74a2824228974f7cd38958fc14ce89055e997adb81bb88db1c1e31d68e96527f2767d6193053dc SHA512 ccede3941149e254e1f64242fd4f804a089f8235308a8dc137820beb6ab78f8867292fa27cb467051fc036baae280b19d5f386053c6c7e31ec682cd7bdab901a
diff --git a/dev-python/inflect/inflect-5.0.2.ebuild b/dev-python/inflect/inflect-5.0.2.ebuild
index 3edb82bfc627..760eca9c4050 100644
--- a/dev-python/inflect/inflect-5.0.2.ebuild
+++ b/dev-python/inflect/inflect-5.0.2.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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 927e66a95914..1eccc54544a8 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,4 +1,4 @@
 AUX iniconfig-1.0.0-pytest-5.patch 1809 BLAKE2B ccb4383f447f84a88cb020daf0b17ae626c627ce46424ba89591e1feba8ba38b48877e0cac83cef8792cafe283e632cdcec358f6d3929146cc67d2da57848233 SHA512 347295b050cc31108ee013a20dd1135f42a85636d83fba19d509a09856e50ad9343074b965e3b80306a9b73bfcda4c5197800ed3c2e5cba8432d26c5397a135f
 DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
-EBUILD iniconfig-1.0.0.ebuild 569 BLAKE2B 4600ea3e6be45d868420bcc5b92411b3126f35e90fe1fb5f2c808ab6e3b3db298f34ecf4a7168e647a7cd12781b5643b2e4c9f0e549742b1f1792143751b3a34 SHA512 7e1433a0e4ec47280b6f41f34bec0fe83ae62d0f7af8a9ccd1124a29cd9ccfb5ba4549ecbdc20a87292391989e38293450c3c588e60e0ff2fb78331010cad8a1
+EBUILD iniconfig-1.0.0.ebuild 580 BLAKE2B ce259dcb36fc087dc75fd6919c2ebaf15c02ecf33bc264242976590d5de397a20d6bb28e5fbd8629516753053bb78eabc5f261b7370d0b96fa3b72672a039dd0 SHA512 77b2c635a013aa21cc3be927d379c516c855154b6dce273258cb75f3a18a3018bc88fe13353677846fe57e8ed68d3febcea9cd3858d6ebeea54cc494eb8c4f3d
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
index 4c85666261b4..da3d3e6d86df 100644
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x64-macos"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 5a85e4fed3d2..56d042cebd6a 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -4,5 +4,5 @@ DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164
 DIST isort-5.6.3.tar.gz 161712 BLAKE2B ffbc2977016807d2bd5b1644377efad021af2ad27fd0e27feae1e5dfdfd112c7b5bf4b296ebf47ea6bfcbfe7f56cf3bfa8e1e7cf03963935660e678223397afb SHA512 fa2d9be306d03fc802aab3915bee2c41f4fe0c28353d9d99aa6604755e1602027cd81afca92b4302f80497c88a9dcb2701ec02ca55a5f9a2866669a68368d957
 EBUILD isort-4.3.15.ebuild 447 BLAKE2B 05640fd2f8789ab7457e0081519c72d6998623a61d6f5c8c6e2a7d2b7c7928949a578f283723d89c6a63f08e7d81670fba6f9be2905a033bab32a23dbcd35955 SHA512 b719b23a49a47897d115d38448ec3ca32a1f3e762113ac2f7b1e0493413afa2127599ff0282eec818ad914b15c9093055657870ac7e4d329a53428fe4087acce
 EBUILD isort-4.3.21_p2-r1.ebuild 789 BLAKE2B 555ce31eb81a5cc99196fb73c98472368f191aa3614bde3ecd9d06c5c9b7956d1d4211b0a08c2f626c8d7a24c8ad346e427b074884d9960a620dd7a49204fa2e SHA512 eb8e7ba2fe0b40a90bdab8b06a8ea71655c6bf2d84ce2119780cce907ffb09c4d3d50d9813e0390b98ec14603072c3307342e66fb72a494b578dd98aad8be57f
-EBUILD isort-5.6.3.ebuild 1635 BLAKE2B 1a7b20559483e5ab8a7d198f78da67fbeb09fb6e764b063e6d7c8bebf93cec58854e47b3f62101f41fa7f5376ae38984d3b96f1650dc8a5d9b5e5bb270362283 SHA512 495469dc6ba7d0524a168bd009e58747a287f3a73f7ea2662fdb40253ff50b105ab9399c9c3f09b070d171baa91dec07a9751cc5e8b489f8cdfcfb53a80d19d0
-MISC metadata.xml 549 BLAKE2B 930c90b9f50799ce1e2c844f2bc5b746567843ff32d91fc39d00b97342432d2a5ab088c70e16ab366249207db3440c8d4431ef2e0a7c9344704ea949f0b6dddc SHA512 8e43b0072cf5a68e2e081a7bef8f6754925276d1600faee317dcf8618848ca6fda13c8607adb6ea03df7a7de9418b88b0be30f5b3d89cc1e5815558b6c984e02
+EBUILD isort-5.6.3.ebuild 1646 BLAKE2B 76dfcdc4b61eb36ba990710e2dfccbd278a9c1e7b240d232fa1b0d7a5ab3d09d3a81712b5ea86aa3ddbd511e035b6db0a20065f747188de2ea7b19dfe2137891 SHA512 fba2a46dd3d2e321f77379220837e5c2908b0b9c5db60191c0e131f4fc5a8ed0b486985d0095a169e0e2686f33b63f38dfdef0860babaf2af01d67ff95b72a4b
+MISC metadata.xml 573 BLAKE2B 025e9dc210ba42b2d385c75897d233aec2fa2810b5a2699339d1f33da94a8b5057001af48fe68af1a1c0a201c1ef73971433498e7f8c72cafaf306b51af17375 SHA512 369e47a3727a5c48720f9275ee6dd6b3dc5ee2fa05391da8bcb256d4c35af8a76bf33149a63eeae2a7259f59632f6cd56f32910ab10d652752c481609429238f
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
index bc0954c7f8f0..65d91d48b06f 100644
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ b/dev-python/isort/isort-5.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/isort/metadata.xml b/dev-python/isort/metadata.xml
index 459e820983fe..f56f0238fab5 100644
--- a/dev-python/isort/metadata.xml
+++ b/dev-python/isort/metadata.xml
@@ -8,6 +8,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">isort</remote-id>
 		<remote-id type="github">PyCQA/isort</remote-id>
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index 1ef565a3cadc..ceecd6a0d467 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,3 +1,3 @@
 DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
-EBUILD itsdangerous-1.1.0-r1.ebuild 674 BLAKE2B 3a3377574f5c01cd9a7003e2cc2b4d97a7bd98dc6e19614e0335ec8dcaeffa8c208089715098003cb58f271963fb5caa6d74863d21510e24abe79af85a836c7e SHA512 9a71f91587582c9681fa69e7ae79332f4edf37b9130f5a1766c164be03cbd18db73a26baa7b04448420247ab3b12b41903ce931c1a17cc6307d6b067dc809d76
-MISC metadata.xml 325 BLAKE2B 77ff2333a1e15eb410f0c320bf5b62c19568bea653b4cda79294debf6dad02b774f914ecfb3cecbe0adb1630e36bc82727ae77ab09f2b8314fe2ccc101df6737 SHA512 ea6c9ac90af243fc0367615835740108e37ddb9547dd9f288572af097c978e11c3fb2a17398950fbf842e6d1a4fb0410a74e769ad7b0c103b2d9301497578e22
+EBUILD itsdangerous-1.1.0-r1.ebuild 685 BLAKE2B 5ffd4bcb48a27d83624c54046c312438984b0a81507596bd537d99d808ce19c8b3383c3f04fc03218fe70121beafc13141c41357da319e42811eb397c45f439c SHA512 c5c74245030527e0e4f9ff60c118e7cf61df6917ceb2c44118cb93bd8f0befeb51f62a116300736ef4057327dfe9c2aa9ef84b21b3cfecfe0b2dd1788e6b330e
+MISC metadata.xml 350 BLAKE2B 5dc43badf2cd18c7bd58032e495d43cf474b2556bc18b56390ddc3e55b89e82c537434393b009e0b9b98b122e2a974b97ca85e4679f3022fa8b911271843d11e SHA512 fdecb5995b6d9c9ffa1f475483bc0cb4400bb7957803da465931e52e156efc726acfbb303ebfed640f3c8b130e008aacb20e7da74e01f72d4e03c122fed16ecd
diff --git a/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild b/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
index 5ef7c878bb5a..eede3fe00db9 100644
--- a/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P: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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
diff --git a/dev-python/itsdangerous/metadata.xml b/dev-python/itsdangerous/metadata.xml
index 60d737336602..c6b55faa5345 100644
--- a/dev-python/itsdangerous/metadata.xml
+++ b/dev-python/itsdangerous/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">itsdangerous</remote-id>
   </upstream>
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index a54c91416021..d7f0c2641628 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
-EBUILD jaraco-classes-3.1.0.ebuild 1645 BLAKE2B 1f63545c418cf16dc30aaedf9d0fc1162c25915799b41c463263c9d413cb98cd2f287e5651a9ac44223ca58b0d596d9c6d983ed0862bab74d17f901731f6a386 SHA512 3d28413e382151b831cd2f1fefcaa1f8a5a44ddec6d3932be89cf022123168a3ff520dd3e7083236cabf9cb632537af88fb6e7975737b581d02c1271463badff
-MISC metadata.xml 553 BLAKE2B f5e492cbcab83e5783cb3be7f42c48654f7dd4ae620d92029d7e51c653a1c78b7488bfb6ffaa03a08fa3aa0e99b1b2384cd15de6846ea16ff4f89d948cef5900 SHA512 03759959ae7a56bcfb92581e9586cdc5afe0a5347009a74aa4394d4f65c9b929b15572f7faa02914d376443204b693544fde85e61558688c547a58652e4d2800
+EBUILD jaraco-classes-3.1.0.ebuild 1656 BLAKE2B e96cf83eb855012ed2e6cc746e7ae753daeeb7dfc492fc83cded7090fa6b1a36e546e46e26f5a5d935b84b69161c1d885762b14f475eb4639d52284993b29406 SHA512 0a001e545903a24bef8252f60516e65cb877794ef376207daa053e3d38c37ce5d968968d4551b30138461b349b88a58127478d0b774995d531bad1d58dba62f9
+MISC metadata.xml 577 BLAKE2B 5daf4529f9a92c285bd3ae07a6e75f2ea5ebd4466721c65d529b51bf9b32b72d17181e5f89410182138b2e94f6b22eb6f1164744f5871585d38004cf6ee1ee3f SHA512 259deaabde7595f7978dfe12b2b90327263edec17aca918675f14fe87fc8ce041cc337632af1b6cfc55041338087c060d5e88b5b018bf2c1c2c21781f179c601
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
index c633df5dae46..8b8c724c4ef1 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-classes/metadata.xml b/dev-python/jaraco-classes/metadata.xml
index 5340d0fdb989..43a521152f0d 100644
--- a/dev-python/jaraco-classes/metadata.xml
+++ b/dev-python/jaraco-classes/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.classes</remote-id>
 		<remote-id type="github">jaraco/jaraco.classes</remote-id>
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index d64cc9613043..0c2a87bdd2b8 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd
-EBUILD jaraco-envs-2.0.0.ebuild 1030 BLAKE2B c7f36e96ee3ef5ca84de9e4068cdbeec3745fb6f864288f44325afabb24a76c85b55f321a7f231db18b59478d53659f5c4e141f4c69dd493b19a5d669b43af5f SHA512 64bb1c3a7b36b5e731990a1cf4ae245857189232abf73365fec3d448cbf3966a568f6caecd46e58f40b79c7c599896f3938818a88c887f681ed95c6e082e3951
+EBUILD jaraco-envs-2.0.0.ebuild 1041 BLAKE2B 1d707480f89f1fc5bbcccd053614d15bdc9740b4f7407ebc6f865d9946a3841bfe5e553b8b723aeff9c37ad732fdc5610ac4af617883e88444e91a7bfb9da9b3 SHA512 a6b19559ac9a66f6ad85aaedc3545c4cc240fd0fbbc49d6aeda0e9ad341cc6c863a400dc74d8d5fa55ec9f5b150bbca41949114f20f3ffd9eb837931891b284f
 MISC metadata.xml 396 BLAKE2B e6dc26e54f94142429135696cc42201a0ccc3331a3e87cb3294bdae386b84a0f804bb91410294dd076badeae53d93b5da2158e8114aefdefbb91bd93ebb14ba6 SHA512 1456e135ae43a738ce79411b5040513a24acfadc4ea040cb93adcde5f61e6eed7c0798f42b32ce473d4bdc6563c755f5f4387f5e3cce350d557cc00a6efa899a
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
index a70ba1c43607..5e0418fa03c5 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 3c018234e1b5..0be9a37aa52d 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
-EBUILD jaraco-functools-3.0.1.ebuild 1423 BLAKE2B 6904ce282b02d619ab37901ee1c673ffb9fc4c2920b7cd5ef36d872a9f5a3de9022f2b7aac4ae17fd41c3cec6d03720cce1e0cb5fda6b49c1e31d1ac387c3635 SHA512 d937999b1468c0fe24fcb366559ccb2b47d48a4feb15e6c1c18c84532f3ccf8556768beff55b7146e15d1dd89ab16e1510b7cac377338688c147d2f544c921a4
-MISC metadata.xml 651 BLAKE2B 3b8c3e620ec97e632d9d67c336e08989f662e36cd55ed0c283f7f9f4020717e099f00a438e550d38ddde73ca2736e728e74e8110ac957c797b109aa4252503b2 SHA512 04cef990bef9e5c53188b1c5997549644588a0053c06109992ae4d1757c3cc76553b3a3bcb535f4e3a0b33d679083d4c2247a73bbe69a6b1b606f99a6c96abc0
+EBUILD jaraco-functools-3.0.1.ebuild 1434 BLAKE2B 896e1c5abef40258894590a50dc2e71d5ca24e7d65b625103e0d5cfd1df105ab5ba70c4e1a703c87188be5f1ff18303ae2e9673dbfb106b5fe5eb0a8d04b577b SHA512 c294f693d572a3328c7769a3ff64d9810f561b505dd4b7cd5b1a616b4a2ac8259cfefce49432bace152cbc14de81447676898f74873cb506c668582a5e58e0aa
+MISC metadata.xml 675 BLAKE2B 64f36f8fd58d397d3efe5f8a5026eba903a37a6db1a1b2cc33fc893b3cc5c3b9c191adbe814f508bb1798b0e7e5ea6cfba61257982495eb536aa1d244dd86ed8 SHA512 abc84c4f12b89d334309821d54b4d59b2f1b490e83656bd375ed932835aca4dd9fd3299fd496fd33a34a5ef0991af115211b28ff83179632a13963b68ef9156a
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
index 94c723d9061d..95877b4e1d17 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-functools/metadata.xml b/dev-python/jaraco-functools/metadata.xml
index 49414a1138a5..a46997bd91b3 100644
--- a/dev-python/jaraco-functools/metadata.xml
+++ b/dev-python/jaraco-functools/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.functools</remote-id>
 		<remote-id type="github">jaraco/jaraco.functools</remote-id>
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 6ec606185852..bb10575d9fbe 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.itertools-5.0.0.tar.gz 19517 BLAKE2B b38bbb75daa53ce9390a51099b3ebad16696924c26c6674a7c5b9ae5e219db6560d1bae24b4c491d6e424b7fecea66dac2eab673d0cfa91fbdb3a4246b852944 SHA512 38ae2cbdd436b277e3d3c252fadeb5239e2d32b2291686b2a3dbaca69328392eb1db4318b2144954b17302e5b15b94ad89f1ea8a1b2e354deec7d4516bd7ec85
-EBUILD jaraco-itertools-5.0.0.ebuild 1733 BLAKE2B a96def64e608fc1972e8f8f6a8441ff69d4f607b2fc2d76a2989b65b2eaea5fa79314e5e9ea17f8b39450262cac8302fe186223dee9b32d8aa29233bb23f8aa4 SHA512 f6b5c9ae7100dfa322453aeb1bd1baec067f0c5209ed0b18e71cdf938c128e3842c38b8e43b6c8bc297ca829416696c6b7ce3bb23de528f59b99d1e2049f5442
+EBUILD jaraco-itertools-5.0.0.ebuild 1744 BLAKE2B 971dc647df3314bb97db44399ef44e41782086623d16a078d45aa69dc70c7b8f18c33900bbd23b34982f4e3731f916d819a1dc6874fbdc77e90c4b8c38c47512 SHA512 212d65ac2feaa259a4d606fb470b529156d28218047d22b44939c44612f5660e841885cca6103ab7a60533e279ab5150aa488df8efe2b8b0df5360ed04a2399c
 MISC metadata.xml 574 BLAKE2B 34119daf42496fa9353422fc70d8d5bd03936b9382e02cba2f554a4da87069e7e2de34458a99bbb7a894089ea5ed8a119dbaa6ddb120fcfd91b0fd4aa49da7e0 SHA512 33d73c1d093721f5037ab3ed2f8121827d9de51194dfef1794f6abf4ff68db118569ff8ff19fa3433c804be422d1b9ca08aa62bfdbbb696297ad1970d6ac011a
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
index 79f2924b2f97..4b4b9f83e466 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index b1155f452fa3..8bdd33ceab1e 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -3,5 +3,5 @@ DIST jeepney-0.5.0.tar.gz 48460 BLAKE2B 5ce1fd0315ad839cf2e0ec5616a448da840d1d3b
 DIST jeepney-0.6.0.tar.gz 49513 BLAKE2B e5f9b5104cf07dbcd2d40c2d22b690dfd56c456ab56daf44f4abee83f0bfe7e1dfbad797348044d51e3dc20fbc6ce68bf8df54f9c1e46d7a86ceb22d3ab30f8d SHA512 140be9dd28ed853d2d41b6a8bbeb2f22c0270ce7bf33b943ec2ac010db17d4f06e253fa8637fbbb3044fe9ffdbfa1e15f0c663eb44bdd538f8c47c2e7dab3ca5
 EBUILD jeepney-0.4.3.ebuild 802 BLAKE2B aefbece367f00496eaf9b986ee25c8b470dbac4d4ec4c9715b8b1d29b8c31f4307d6b0ce67154b9fd78bd518f984c8fd109185610a7b9dc89efef7b57568fd49 SHA512 13e500ebc659528d61478f15329c0b084c5556779e742144c5d3e5d3bff1c3c9eeaec607974c58e74c730c8893ff662223adca2fc2971f8a4672af687e339fb1
 EBUILD jeepney-0.5.0.ebuild 901 BLAKE2B 8a3f0123b780ceb28472ae42413935fc9275d3b18f7afd38bb2b6f63c42b5e917b7d649de0a9e34166879cb4d6054426570479ddfffc318f7be785019b956167 SHA512 f803c084da92b733fda5e044c6d0a055cec364e927d2f02f94e34986691c056a06e87a64ba2d1502f892e5207aa79ae36d7f23c4153763fc1e23874583efb023
-EBUILD jeepney-0.6.0.ebuild 901 BLAKE2B 8a3f0123b780ceb28472ae42413935fc9275d3b18f7afd38bb2b6f63c42b5e917b7d649de0a9e34166879cb4d6054426570479ddfffc318f7be785019b956167 SHA512 f803c084da92b733fda5e044c6d0a055cec364e927d2f02f94e34986691c056a06e87a64ba2d1502f892e5207aa79ae36d7f23c4153763fc1e23874583efb023
-MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
+EBUILD jeepney-0.6.0.ebuild 925 BLAKE2B 478e5425a65766d465b41ad3eb302eba226c920178a30614d5c9341d128c770d9f33bfb924279f11f7801def9a9aaeddba75ab300af304e942fecc6e40f4f12d SHA512 8499b55449a060f5a640208b5f63092da83fa6bb45d91d7cd3f6bf04488b1b940ae688aa821c15c965e6344be694238941b8e6fb7c988af5b00ebf137e52fc00
+MISC metadata.xml 456 BLAKE2B e597aacc0128f9cd06d21a03ca156343861a56adba6449e12127025265c6019308ba2e8f360d7a4f43bbca3f95a78789d964bdd3e5bd5fea7d21d7b8eb413c74 SHA512 6cb3b5fae02190cce838221a1d5269bc005f985d5935f77880b066999340818338a747a9e24aa5d39ab71f69c842747068e3b573dcf475c7d552af1bc9af031b
diff --git a/dev-python/jeepney/jeepney-0.6.0.ebuild b/dev-python/jeepney/jeepney-0.6.0.ebuild
index 1c412f4100c2..37af4f03c001 100644
--- a/dev-python/jeepney/jeepney-0.6.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jeepney/metadata.xml b/dev-python/jeepney/metadata.xml
index 8e28a357224d..20ff9185ed18 100644
--- a/dev-python/jeepney/metadata.xml
+++ b/dev-python/jeepney/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jeepney</remote-id>
 		<remote-id type="gitlab">takluyver/jeepney</remote-id>
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index b0cd4951a544..2e4ede7e3f79 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,5 +1,5 @@
 DIST keyring-21.4.0.tar.gz 73591 BLAKE2B ad8fe71a6a8bd3180b01ce3ca0372f9d1dc493d3eb58ced707d1869284d21ceaffaab314c1304b58461d771fa1a4a5981ec8fbcfaf333d602bdef7985d8799eb SHA512 149f1706296c830605d0ff2eddacf3d531c3d80f694465785d83e2af1d55a49204a2112db840522d4de10cd012073cafe571638e2c39a2f61c308821fe5ec901
 DIST keyring-21.5.0.tar.gz 45885 BLAKE2B 73fe60f0d414cad3b36e0c995b63f048f75358b9f4d389f41ae3a32d68c82ccb9d1fe76d9bd375d06519bcebb8ad9aa34ba98676bf37f3c5a10d9424c161e074 SHA512 25cbbcac0810829e48e6ff4c9497b8c9f3c03011047e76a6901f6c422d6eb1711e535233a90d96f8dc16a77352d4228114f3b447d9e196184a9d87402658f5bd
 EBUILD keyring-21.4.0.ebuild 1156 BLAKE2B 5746ebd36c32f8a05042b1b89b05ca2f5b71857c69e1325ae20ad3af7924d4894a92846dc4912fbfdab2bf3d69f13137503624b632e60e64a1534e0ede08d255 SHA512 5836a15a5247c525f3f839826cc5685461c3282528f4f44c136ce6ae3577a106cb92ab97e87321b994b2702a5e91d45786a00cda37f3ebb114770db5c46bb136
-EBUILD keyring-21.5.0.ebuild 1161 BLAKE2B 040eef979f481387080ba79a1f2240ef152d8822aa0feb48b8a2b911c642d05d64ec1fc04f5e42a0c4332bbb5e8fa839bf32ddfbaac235f0b10e0da6d1c9f0d1 SHA512 ac38568b6b611f9e01e8bb7eb5f94defadbb1429e9fb430e3b251b471b178b556bd3d8279e5ba0d7ae891715371c6a3dff6a3918024a3cf0a913387152f00f71
+EBUILD keyring-21.5.0.ebuild 1172 BLAKE2B d2151e7d29443366931f0e71f9bf08b1deab55eb592657e66b77278c5e9ba1be749780e6cedc9144be6e1e108b11105ac3f8f00c80e6d6080579382135973792 SHA512 69026bca0ad861e49726e4cde2497fabb8421326ce7b9b1b250e413a55305a794fc2ddf0abee91ce6f1a0f6358db5e5770a0d77d002ddff605644bd7bea3c77b
 MISC metadata.xml 610 BLAKE2B abd4cf8986ea009081e0e21d31b8bbdbe7b2e99fb332bda41d666c97feda8974cabcabdf6d88e4d8d9a2b9aefd250ad06bfcdd8888513cc0a10cdbda9c93c981 SHA512 931f5d607bc5d9caf329f0b7a010ee055f3c962e67e61c8f4e7458f5325a89bd91678c215fbdd63160eb2d7f34ce58b0a30b144e4159fb426c243efa1dc12d05
diff --git a/dev-python/keyring/keyring-21.5.0.ebuild b/dev-python/keyring/keyring-21.5.0.ebuild
index 0e600149487a..e2a8239584f5 100644
--- a/dev-python/keyring/keyring-21.5.0.ebuild
+++ b/dev-python/keyring/keyring-21.5.0.ebuild
@@ -14,7 +14,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 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 05045c45ffe5..f0c272812c46 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,5 +1,3 @@
-DIST keystonemiddleware-7.0.1.tar.gz 177439 BLAKE2B 645cade35a1b310b9a897b17fc96a7f1f33ca26efd3dbe482c8d76cca9a9639364cda6d2798c0b2956f5b905c166a67fe3f334cd0ae276e7b0124956f9a9cfd6 SHA512 2c3890a395fe03c19e121a1d315180bf2bf5004351a5dcabb1f455bf22514c682347a3c387da361075a81c3e931f6ac802aed1a95fa3763b90a2ac77adbec306
 DIST keystonemiddleware-9.1.0.tar.gz 179846 BLAKE2B 0ebae088d48f4f8444902c229e6d3df7835d847b99d9620cbe154a1ed6f12fa9533a9c62aae670d9d16a5696e5245306c8180437c772297000b8cf4490264568 SHA512 839d2c0150f305d7642bf1031508d11cb7d26e560198bc900979615838ea0a143843fdfaf363699313d7c968850153eaedba0f4a813891f5aaee46a2444181fc
-EBUILD keystonemiddleware-7.0.1.ebuild 1466 BLAKE2B 3be59200a860cb8097c5bbff3774b3e80b08fe85d9e4b3e04838dc3d1f7d27031d6f8dd11fb63fd5c2df04c1272df28dcc81ec1dc80836b82f32298fee393d39 SHA512 7771e244dac935eafc985eff418dee5b4bf6babecb6d19f1880e29132d1bc5679c3b56b517d5a3be53392a47f1590af2cf361e70310a60d2abf5bf16504a15c1
-EBUILD keystonemiddleware-9.1.0.ebuild 1407 BLAKE2B 053418f065a73930b327e6d1ce12ec0e9f7e4916101600b8c30013840b9502224cb198f108266d5c3f2ee9cc2e991118bbf05e7c6996c0f28d321860c803e8c8 SHA512 be978ba99e588b4a7d83729c9408f3b197e45f212639bc60c948eb4b506602455ce492a7bd82179418d969ed9be22bfe7815cc64599a3a403fce2bbf575840e1
+EBUILD keystonemiddleware-9.1.0.ebuild 1405 BLAKE2B 65e3b88ed5597c39667a4942c4ca77c0fed1543cd2d44621baebbdb68e84dabf03742bb9bf1a3c9cf9dc8eec12df07a0f18937fe9177f563154390f49c3653a1 SHA512 ee799aa9fdbb96f9cdae2e26a8b5db96bb4d9a7c550736037760dc5675e6af002900ce98ae6fe1879a905cfefa1c575be21a72fbca66691da7fa9f3c7345e905
 MISC metadata.xml 553 BLAKE2B 7ae9cc31354b5f88e1975e402caf885cd207190d9f3841131893d8583957bb53c53a1067506233909363c6f52bb6e3602ffa2ccadb9f5d8662beac9702777051 SHA512 fc565d408c098400d7c2bcf223cc691e5dc62073076082f0b04b4d4a4a0a80e0bb62f00f6062a33d957033b4846f2bd5d4e00cbd3f0ee6eec65f1b8abc1f68ba
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
deleted file mode 100644
index aec07f809a6a..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.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_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/keystoneauth-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild
index 62d99b468be0..d5e0569fcf1a 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 07fd415ad9ef..09b48d70206c 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lit-10.0.0.ebuild 863 BLAKE2B efe99feb8f7c0b6b4121591f240120a47f3f2c673d5b5d3908184a6a395b206a84abcf0f524f3106357a35b7217122875b6b4d5365af26676a48d3e1194a0158 SHA512 a3cdcf3d5af68f02e0ced1427c0babc7470b1268f7400d6c4db7d9961d5f944191777a03e3ef2c30a55ce75f003c1cdea382f2a0218e5c32c1d0c4a0b2cbf523
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B e23af1f7a6d50e660ccf67a800375129465f3fc0c89e0be4e8013318ba9882df788baee745ddc9e932e1d42664cefbc5b08c1ec550a162a3d1ea39e1f22e66b0 SHA512 20206b54df19decdcc35112630b734351a9aafc2093f8ea3b5a57baa2db822bc3583252fe784d8af4ca729a0ee5f0cb1ec53e2eba85e94e21cd7b6c4d80e5302
-EBUILD lit-11.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-11.0.0.9999.ebuild 869 BLAKE2B 0338f86d2256fc370fc708e65482eccdc101917726ffaea02dbea297d114e52abfda416673cc94f8029671c705396d36321518c080d38cdd5ee68691a5854136 SHA512 54c0401c0d4b07ba0cf2fa4b69975a58d2fab218bf7925488637069844d8e891eca2d76806d4a12ee26b04030d0f8e5d68d034264469620d95c880e867d90d3d
 EBUILD lit-11.0.0.ebuild 893 BLAKE2B e23af1f7a6d50e660ccf67a800375129465f3fc0c89e0be4e8013318ba9882df788baee745ddc9e932e1d42664cefbc5b08c1ec550a162a3d1ea39e1f22e66b0 SHA512 20206b54df19decdcc35112630b734351a9aafc2093f8ea3b5a57baa2db822bc3583252fe784d8af4ca729a0ee5f0cb1ec53e2eba85e94e21cd7b6c4d80e5302
-EBUILD lit-12.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-12.0.0.9999.ebuild 869 BLAKE2B 0338f86d2256fc370fc708e65482eccdc101917726ffaea02dbea297d114e52abfda416673cc94f8029671c705396d36321518c080d38cdd5ee68691a5854136 SHA512 54c0401c0d4b07ba0cf2fa4b69975a58d2fab218bf7925488637069844d8e891eca2d76806d4a12ee26b04030d0f8e5d68d034264469620d95c880e867d90d3d
 EBUILD lit-9.0.1.ebuild 861 BLAKE2B c4d1a504e922e182102538cc19ea99683500c533af440179bbc99f22aa21558585a7d4f6bdc8ca4159c2300150ffedba1cc980c448fbf5f146d4168e65a3c9e7 SHA512 7916fc0e882021c5b3bf21b4b565e73e83380d9c221b61b31af0acb5939ee3413a1a6638f7328b0815081316300b78836273ba20448b4d8c9d5baf73278184d9
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-10.0.0.ebuild b/dev-python/lit/lit-10.0.0.ebuild
deleted file mode 100644
index a61d6f3ca2be..000000000000
--- a/dev-python/lit/lit-10.0.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 llvm.org multiprocessing
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
-}
diff --git a/dev-python/lit/lit-11.0.0.9999.ebuild b/dev-python/lit/lit-11.0.0.9999.ebuild
index eafbdc683987..8e876ebd8594 100644
--- a/dev-python/lit/lit-11.0.0.9999.ebuild
+++ b/dev-python/lit/lit-11.0.0.9999.ebuild
@@ -10,8 +10,6 @@ inherit distutils-r1 llvm.org
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -25,6 +23,9 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		sys-devel/llvm )"
 
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
 src_prepare() {
diff --git a/dev-python/lit/lit-12.0.0.9999.ebuild b/dev-python/lit/lit-12.0.0.9999.ebuild
index eafbdc683987..8e876ebd8594 100644
--- a/dev-python/lit/lit-12.0.0.9999.ebuild
+++ b/dev-python/lit/lit-12.0.0.9999.ebuild
@@ -10,8 +10,6 @@ inherit distutils-r1 llvm.org
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -25,6 +23,9 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		sys-devel/llvm )"
 
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
 src_prepare() {
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 0215bbd70c04..5c6956fbcfd9 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -2,5 +2,5 @@ AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4d
 DIST lxml-4.6.1.tar.gz 946461 BLAKE2B b1ea8e15af1130b9f9683614bbc2480ec5008ad697f70536a332c1faf4bda4aa9525b2ef5d82d32c415c91e47ab54c7b3cb644e9a2933517946c3fc8ab7ec7c5 SHA512 3cc917e7535ac1be3db8939f72846313267c8b1f0adccc92a2155a160ed7299d0def718bdae1379e42398ca1b959b1130505597febca00f02cb87c8666f1f1c3
 DIST lxml-4.6.2.tar.gz 948652 BLAKE2B df6ec7e183df48c0edc6cce0fbdd6ab78eb8d1b7e8fb81a76bd9f4a24f05923c757d5b21f508be9be50c7bb187927c4e3a66146d480f2d40efc05388d26d3bf5 SHA512 81dcf5cade7b05c0e831beae7cdfbdb21e876fa55b23da98b89cbfa7960a4737efc13346ea3ade22a2448f20e036173cf5e32d43df6656c3231bfba07981f9ed
 EBUILD lxml-4.6.1.ebuild 2237 BLAKE2B fb05a57bbe17e7fa4f6f0e0aeb666ceadf4cbc3654ef331f3548cc5916900a3692d3eb748a0284ab053d91e6691a568d703b96c9a446b035413d617b9bc6608a SHA512 5bb200f0e1759dd660fe9fed714add77fef4c883eb804f40b0fd623f3c2de5d394b0dded79f39a78f5942872a1168cceda43690635cd764317eda196deec8fb6
-EBUILD lxml-4.6.2.ebuild 2245 BLAKE2B a6ca94023865cf68cc0153d97be94a03ba48f2f52d844eb2909cefc4e5e7ee0636bf98c2fa26c11bc3747d3ba6d48daadf27fb743c3eab8389de9e8c9dc8e061 SHA512 4d9b2d797538f11f663fdadb20d98c13e243e81fafdf3cef39ac49c9c6fdcf10a8095be351014ffc29303dcd3d8f67cbf3f36bf4b75817f2a3402c1544019ae4
+EBUILD lxml-4.6.2.ebuild 2240 BLAKE2B 645bc7fb20df3d9aacf01b19f47b1439cf267598aadd863eeb482fec180889a50e49d527bfa3270d94e1b0b9f5460a2d3d984eee6b0ca24914ff182900f0dc40 SHA512 3f13479c4d004431540354cce7b6f1cc23982b6b130f0d21a22fdc4ca312ceee0fdecbb00054b7a447017d2f7d715d459abe27159854533889c6ded7b73d573d
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.6.2.ebuild b/dev-python/lxml/lxml-4.6.2.ebuild
index 1a7bf27b9c58..6e8b07cf7538 100644
--- a/dev-python/lxml/lxml-4.6.2.ebuild
+++ b/dev-python/lxml/lxml-4.6.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 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 ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 5445f6c1ff77..c4a4fb06d1c8 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -5,5 +5,5 @@ AUX m2r.1 9244 BLAKE2B d7ac673d0750695f8b21b6e9d0c5328ab8934dd20eb88835c655affab
 AUX test.md 34 BLAKE2B 88eac9a501f3fd54ac3c9555612c7d3860d5c692170fcfeca3d75b665611b75e627443e8a54d8dbba4c820b2f793c5b933a76493381d295aefdd5ef55b7fc1d5 SHA512 c4b98b3256e14d46187d4c5cf5d3b26e4e4e0b1c6f2f61618987c234f49ea5a9bf31a94b9d2c4907bbd0685fb30138a5916b5dd3c8f92cd80bf0c7c2e657ae26
 AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbdd1cded336a736978a79efff42c7cebcd1a420d8bc4485593d675b3a66e3f427434147c9a SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7
 DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
-EBUILD m2r-0.2.1.ebuild 1411 BLAKE2B 74518e7617eaf6a4655830a6226136f91f5f21889fc34141b3f4c9792bd849ef9527763e34d8ff8e165877896845697229fff851311e2ec15e7ab062fec9a2e5 SHA512 2df9a0e22a63db142eed6bf0d76bf0337c91db08d31759dd8c943f91906d7929e6cdf0bdfd56ef4f5e23d8013a9c48a7bf9f70dadc2092086cffbaac12cc3674
-MISC metadata.xml 460 BLAKE2B fc2b57003045116830f1a25dd6cd1f6230a05e1fe14dc2bb7cfcd65c49b1b7d05e405007335a32bbfef95ab660ec5f0c476392f2ab516eb513add9da725abc87 SHA512 b32f1840054745c2985203c25baa12aeaafb2db1fff06f413ef95ad6e72ec7f5f78528db32f06d5b1f600c76f38d13b6ee541c77a2c6e36ba726174375782b26
+EBUILD m2r-0.2.1.ebuild 1422 BLAKE2B ec113fc97b1e1b5a37ca22de0054dd4992530ca0115ea31f55074034a55add796085dc8e6a670fdbf480b3653a633b887b82642fc11027ec77ef95caabd3cbca SHA512 487cab758f6a51093afcf04f031dc48180831066636a9e2abe03a2ca0cc928c54627a1575c7239b2a00b63bcb9564116e3792fd6f0f8662360d5b3ef129225bd
+MISC metadata.xml 484 BLAKE2B 3b355a1278f7d4228f6a050fc7ed24eca1755362843cb166c3870c8c6b9ee86d5e4fed899c2e27dd6294767197c0df1f7f081cc82a8fdccbba1bf7fdf54253e6 SHA512 df5da26b52db4a7d5f62f7c75fbd3ef51f5b59d5fc63fcf33040b3402c001065e44c2f6daf616d1b87188415bd786a85526705e7bf1b1b08c9ef50b3239d65c3
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index df0a58f8f860..653708138c6c 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/miyakogi/m2r/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 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 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/m2r/metadata.xml b/dev-python/m2r/metadata.xml
index 36d6bbad5e86..21ff52b0bcb3 100644
--- a/dev-python/m2r/metadata.xml
+++ b/dev-python/m2r/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>miyako.dev@gmail.com</email>
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 394e5223e2f3..01977f50b842 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,3 +1,3 @@
 DIST mistune-0.8.4.tar.gz 58322 BLAKE2B e65d45c5c95706a49a7fd407afe5f10e82a475766ca272ec3bebba8c89e670fe6efced7b09537efb69d3fd36e75091e370170a15ad7488b5cbe9186e2ccaf4db SHA512 36c3ef5d5537f5cceaa43e4da20a84b27c378cb744a93f0380024faefde490bcb42c453f79002ca049083fc437278f4afb3e10de5462f9eeb9077ca2a2fcaea7
-EBUILD mistune-0.8.4-r1.ebuild 527 BLAKE2B 5f2089c3f66705ed70b78a931380bf10fdd44db669bc6a3cc22ea291d5cf3945b974fd76f3e2b411df6a2008d32b3504555d86cafabc0bf687f8cc188bdf2332 SHA512 a5eb52f74922f9431c4dcc8edfa5ebccdc00543298b3799c9120c06c5744939362f77ec21e1a0aee344ed539577b1449eb97c40952ec5f6f29a039f5eb2a2471
-MISC metadata.xml 377 BLAKE2B 6c495d3d88811994e4baf0aabb5267343c09162239cc655b5fe4f9b8b63df4cb08dff0186cbe6b63018eac2cc2489a3f612f72d49885df3055591da74f5fa5a5 SHA512 3630e9ba514f3f3b1ecf532ca928c3bc89c05ab50a9113ab4b1d609edf07a6421796774ee4a71cf17ea3c2939acea24e22a74f33b66fe630706dcd6482cf817e
+EBUILD mistune-0.8.4-r1.ebuild 538 BLAKE2B 9424bf08f48143c3ae4de1fa279d03daae7e42a8fdbdf65c28a241e678f13ef33fc951de7422613d018b0f89d35390c8788e493cb85e498c499d2df665e2b1c4 SHA512 9ac768799cd240cf8d8910f0f74606d125316b680a19ff7ac30591403177f6ee64207de0f5c011ae5e9641d7ca90d2631008638d789e944508f3dd9e032f548c
+MISC metadata.xml 402 BLAKE2B 25b7a5767bc5dc172c1339f3e7443dcefb5da3048c93203bb7e11635775b9db53cafa2173ced1f0727c1b6834611cb0cfbc5d2e15cf1d288b53c00aab0da8267 SHA512 c63a8e468c0ba98b83a12fecb96c6251fc0261bfcf0544ba6ea5cd69705b79bcf9460230564fda9a66aa6c044c6454e9439923562ee60ac13054cbd2c23c516a
diff --git a/dev-python/mistune/metadata.xml b/dev-python/mistune/metadata.xml
index f012a7616c68..e69f5040c86f 100644
--- a/dev-python/mistune/metadata.xml
+++ b/dev-python/mistune/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">mistune</remote-id>
     <remote-id type="github">lepture/mistune</remote-id>
diff --git a/dev-python/mistune/mistune-0.8.4-r1.ebuild b/dev-python/mistune/mistune-0.8.4-r1.ebuild
index 60a55ef32134..a23f3e979ddc 100644
--- a/dev-python/mistune/mistune-0.8.4-r1.ebuild
+++ b/dev-python/mistune/mistune-0.8.4-r1.ebuild
@@ -13,6 +13,6 @@ 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 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests nose
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 48254adaf46e..cf50161afa4f 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,3 +1,3 @@
 DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970
-EBUILD monotonic-1.5-r1.ebuild 463 BLAKE2B 18c1e7f759d2a155c01f64a82de06edc5cab4dd99c8338763b67ad46ede894b98437cade45af97be864f952478b3b81aa24577f3abbff82ca6f5c09fb93f3735 SHA512 d7ae10bc4f6515a99dd4f3ac0ab482d4ffae604e8ca65ca39cd5c4bbdbaed7b13b3efe1822f79ff530403206e474d8107426f64b64a48885f527dd83faa25987
-MISC metadata.xml 366 BLAKE2B e8045b50a2eb6fa77f3f95b4dd4dd775c2c986bb80eeb1e91f8a775e5df484da48ba7ddf32ee19a35c5a09e340880cc27f2fb70c45a371341872cd22ad01dd74 SHA512 d58d7d85046c7ed8b0deef7fcce1e60c720b8fe4789a35b507c0d91c8d2222d01ffb4778986c9715fe61efbab3109278d1ce76433f39397e4865a493d794f94d
+EBUILD monotonic-1.5-r1.ebuild 474 BLAKE2B 05ccbc85df29067b4362cc1bb26bd00d96e2920998a66372005c0e968d4e328dedc400d39a327c96c0e1f232b52ebf8069ecb7cf59355116fbc876a4b649735d SHA512 a6612bfca2fdf9787310a556c62f4a89a467481d609b4dcb5be5501b74801f5532f63d9ff7f75af6b14f4ceebc13f472bc0b8e9e3a3fd0c3e3adcaf8298cf61e
+MISC metadata.xml 390 BLAKE2B 7caa08a2c33c2217873f6db1205dbb1ea5dc642ce2544d508745ee12d921965fae2fefef5e245d4162720b18c1ee9c99ced1f49d5e1d3f965430947dfac71d18 SHA512 f8e6681efb655c60e4eb8c7abe3150398c2e02661b514af276553cf718597b48e19cedc8c52732f57c77fafbbc1beb67addc0cfaaf485cf2249914fe32e24ae3
diff --git a/dev-python/monotonic/metadata.xml b/dev-python/monotonic/metadata.xml
index 14de77d4f1d6..9d2e85429a8f 100644
--- a/dev-python/monotonic/metadata.xml
+++ b/dev-python/monotonic/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">monotonic</remote-id>
 		<remote-id type="github">atdt/monotonic</remote-id>
diff --git a/dev-python/monotonic/monotonic-1.5-r1.ebuild b/dev-python/monotonic/monotonic-1.5-r1.ebuild
index 29daba27a01f..e209da31034b 100644
--- a/dev-python/monotonic/monotonic-1.5-r1.ebuild
+++ b/dev-python/monotonic/monotonic-1.5-r1.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 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE=""
 
 # no tests
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 9f0e43b301f1..1a56591c8d29 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,5 @@
-DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
 DIST more-itertools-8.5.0.tar.gz 86861 BLAKE2B 6c5d7e0e2bfa89b65636115d5539ca5a36de24b7e0971638721d8fa13f6ad84f0fc64b297b5c3c30d380f78e271f6b6622d72a41ffb8f1941945d5918ec6c78a SHA512 f11a4443d4d5e79fe241fc6e170ae51b08cfb1f1093dddad036e1ba043c30d03c53ab9fccbfb4de97279862c6cfe44759ae88ce6027d871515b032e7d9e435e7
 DIST more-itertools-8.6.0.tar.gz 88371 BLAKE2B 79c9020c641e61d97c350ec9004fabfc4a94969d17c517e421f63f41aedf101217906d5bc1d397dc1ed7666143b15ea7ff0401a2a6b3fccc1d08f3cf9ff55eff SHA512 9fb6cbb1d303c79a1c67d1c473a161d71bc5d88c8ebaf290947c1a6e64c2a224478063c58ffc4d1dfdcb2931bcff9cd165bd8724a9e78e95c6f163000c138a5e
-EBUILD more-itertools-5.0.0-r1.ebuild 708 BLAKE2B 3a3292b5909ea18fdf9a209f6c3270d974cdb0611dacabeab29d9037e1a84b58a37a2f35fe492b9f351b044c36bf6e16958a0105980e9d9091d9744c64ca465e SHA512 dfc434e3aa6d8e92cc49fb38b5d5c533ad389bbc0c97265a8c99542cd03dc77abf64715ea95ff8c18a340d6c4b4e9b3038dbcdb5f396b7c078152b6baac1828e
 EBUILD more-itertools-8.5.0.ebuild 667 BLAKE2B 5f27ed477db780fe6ebc3f1688e73dc25b7ffa233e19af8303e9e02efab75f9c4d908d285023d355af84f2ed86352a19819f0cf075b9d2dbd28bba6b38eba7fc SHA512 4461d23de5f7936a6b7aef06b36508ae19260b6dbd40edb83e5e3685788180c9c04690d064a365bed330322c22c222931f8e9fcd92c2ff83ce754fe12cd77e95
-EBUILD more-itertools-8.6.0.ebuild 676 BLAKE2B 27451991e55f4732f675bafc01b5d3dc4558e31e55194ed8f6a228129200f56b914e7e513504aa66f09f4d39c61bf1128b8831059ce74ba0afbc512a1eca04d6 SHA512 f69c52f49c34965ac6db6ea36ebdcc2abbfb61da5e8f13ac27edb29406fc4af38c118a2f308b1a39897d0a0e5a8c650c3c17c0950711f5bc5dc9923fe72ca0d6
+EBUILD more-itertools-8.6.0.ebuild 687 BLAKE2B 264956950a151c7d44d9986d66e585af719aa3de281e682dc6ede08bdb2d64d9a74cf68b353a5862fdcd44371749d7c52d11773ad88f226173b8ea1f4a5b1f37 SHA512 faa41953b5534a9065ae645108b5b63211664d65558fd4ec52f888d479e3fa3cbfa6cee15b43bff65b124796d4baef8699fef3e0f243ab7a68c3867a9203fb43
 MISC metadata.xml 475 BLAKE2B de5a09fa0987ae45ca73d94cdf2ecaaee8b0f697e1cc4e1b535fd16f50a10460cd5a3293bc1a0633ab099c3ef07fc1ae0d99a2faebfe4117f0a5ab53837ac94f SHA512 3cccec99e9f80ef9751d2e19fc196a177f62a6b72ada30859fb8cc577fd362cac9b8261869b59a85ff1e8b4d9716daaf190cc97b3733f63e014d2e2c838d00e4
diff --git a/dev-python/more-itertools/more-itertools-5.0.0-r1.ebuild b/dev-python/more-itertools/more-itertools-5.0.0-r1.ebuild
deleted file mode 100644
index f45ac9488326..000000000000
--- a/dev-python/more-itertools/more-itertools-5.0.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9} 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 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/more-itertools/more-itertools-8.6.0.ebuild b/dev-python/more-itertools/more-itertools-8.6.0.ebuild
index b3ba108b1290..7700620032c2 100644
--- a/dev-python/more-itertools/more-itertools-8.6.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.6.0.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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index f0b7d1cda6e2..b1efcfbd6fa1 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,3 +1,3 @@
 DIST multidict-5.0.0.tar.gz 57790 BLAKE2B cad5cac04ab8ea204bb98199a8b5985bd308f7db59e71514a78f0bc79cd92667f24329b101638d5cd14254187c344549a8ce8dd6c514b322b50bb05dfa15cc6e SHA512 067bad79b331a4b86d023f59af842e5fa99fa50d09df13538a86e6c1c754b1862b8fa812381149f2efcd19f1a7ec6934f583cddf47c635dce909ea8c7847f411
-EBUILD multidict-5.0.0.ebuild 737 BLAKE2B 59c11fb4f3324bc772a31bd92af93f4557afc3c5a4638b7ddbf712a6c3592db7fb727222d97f5853c9839e6b7b01de1f1ebd805fe3ace929ec06929e56c0f675 SHA512 369d4a8fbbf02db10aa5f63fc0383db27ff370cc52ac3bab175c2894bf347b446f12b30ce8c5d7dc54382b88c1c7317c1bab67ffb7b52a04288042d11ac8c168
+EBUILD multidict-5.0.0.ebuild 748 BLAKE2B 28bdc7b96cab9f7925e56e49e870ac3d72b3508684cf2d1292d85ace9fceed9b50dedf081c5c98abb311c513fd4a43526cc587450c97d72755ca50c8c8f646f8 SHA512 40b09ed07bd4ceae2e1e923765fe835c6e3506a72faf2f1aac8bcb3bc7cb9eee69ddaadfe533bf73b8d94a0c420a8e3a8106741619843229346838ba90f9dae1
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-5.0.0.ebuild b/dev-python/multidict/multidict-5.0.0.ebuild
index 2e0a72a5166f..eaf73f91bda2 100644
--- a/dev-python/multidict/multidict-5.0.0.ebuild
+++ b/dev-python/multidict/multidict-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 8ab445be5364..9d0280bbf440 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,4 +1,4 @@
 AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
-EBUILD munch-2.5.0-r1.ebuild 729 BLAKE2B 4027b7026afd7b4a663fafff10d047086ff8b343ba994ff2509eacd4602aed2d69cc6163d82ab0fd8f586e186f87380913f835d1c4dbd8037b0deaced672108e SHA512 a19707f9827389cf831db14b3168e998b996c4aa5cfca027a6b7267ad5cdb9b3c2977de293f7f6fdabcec6dfd0797d7b8fca985d7052e7adb90625aa52c939f0
-MISC metadata.xml 375 BLAKE2B 55482baad37c27ba7d0ec36732e880b82a635bbf7358e4219d96d0986e56eab1052c7f09d11a2cae544612643b524ca333c7217f92e569d5dc7cf89e025dd53c SHA512 333c300e6d943df9e1d7f43ccb7fb2b96ff13522dca55f8725ab71cf6e4f740d4c11a6bf136a1f1caec79adbafdaac51ea4ec36e0fb1b456edf4f39682036ada
+EBUILD munch-2.5.0-r1.ebuild 740 BLAKE2B d80e5da2d43ac75fcd8a93edce7b2413cabe080669a2fa21aedd8d5f40ac2c65b39c1dada69df82c9810365be1c0255cd32dfbd960bcab5425a12293fa7b6e47 SHA512 354a1e867cd6611e1379e71fddfd5a9f291323be898232e5a5998f2d296515d69ca181b41a78292ec8e86552bcc2e6a98fb00945224b0f6b1a04f8543b8ed55f
+MISC metadata.xml 400 BLAKE2B de9c3fed4f655c60785a7552b740d801b4a435114e2c5716158280288814b241ef5e7b59ee468a7a16d9aa6bc177c958561459e8ac57fb88c566553c79e25fa9 SHA512 e5f2ae1e485e5a1cbf1b4e7ab94f0c46042345751332f0c5d714b571299621447862ad5402ec7b3b770d1f528fbc5a07fd35e7e9466e8f3a1ba7e3245d09f9d3
diff --git a/dev-python/munch/metadata.xml b/dev-python/munch/metadata.xml
index bac372eafccb..c53b9ec2e8cf 100644
--- a/dev-python/munch/metadata.xml
+++ b/dev-python/munch/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">munch</remote-id>
     <remote-id type="github">Infinidat/munch</remote-id>
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index 32c44b8d0ca5..8b3cb508720a 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index 5becce49464e..5629973ea543 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3-r1.ebuild 817 BLAKE2B 6eec3cb0dea021b1f8b3a2ec863819f094f8741c80bc721fd067e72019b49284d413e989cf24dd05ad5da9d8a4b5e141957c0fd9ec32f1a7c5688fce934677fa SHA512 174c85385ee0614caac2764211c982e056074bdb71be6b0938aef70654aa02cee798d06fbda3e2b4c4c0a0f5ab7da66166f372ba9a0a825434be11c6219a10f8
+EBUILD mypy_extensions-0.4.3-r1.ebuild 828 BLAKE2B a790efed16c4c7bc7357a9d915b40f1c0777189316267f29093f8976631d4eec6d79c63752f1ef8f5e131fea79b3e36a718ec01d0f6fa1b166096621484eeb1d SHA512 882a73f42d99c59ab04e0aafc57e411e4f48836752627d5abfbe4af27ff99208ebcf03e25f819f72f5c1bd4d3b7188951c3e8b47cf6fb873e212b3e3fd2247c8
 MISC metadata.xml 352 BLAKE2B 932d22dee01e3a1e586176e5e32423d36100c8d3116cf6b8eb1268665ac7a5456535fbb6b855a4e6849767d31dd6c2066eae3d08868662c211596d7c02f39ec7 SHA512 2eccb85a7150b8592717ee60ecba338f59563fbdc12c172924f8d7743d33c1a32cb9a0bfb41f150e86bfee3748488f32ae9d57bbb240cb7fae4b9f3a00621e4a
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index cf1e0e25e209..57eafeb24b8a 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/python/${PN}"
 	EGIT_COMMIT="master"
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
index 3691d3d0c9bb..e8b7578e25d7 100644
--- a/dev-python/namespace-jaraco/Manifest
+++ b/dev-python/namespace-jaraco/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-jaraco-2-r2.ebuild 803 BLAKE2B 87641a3fd780de40865c663eb7cf15f3bff20dc3b2f0b71401c087069d3f6a650a993ded1da8103603f10229b64d978a990df961078812ab3a78dc447ae67f99 SHA512 48b4dc0730e7148318b27f41cab6e22c03694fe5fa26cde85fdece5af5caf531448db8105227fede88a5ad41b519e80a35dc24b18990dbefa8848767a52dfa3e
-MISC metadata.xml 346 BLAKE2B bf549c97be0470c6694566c73fb27eda911bd1c7e38641ccfc90e0cbf33717499177dcd4d6b6ce475d430a04ba395500d41aa5cf7d7938ae8bdd1c0840e0a6e0 SHA512 747d2fe0daa0213a7f9d737cc8c5037438ef9262ba049a7a687e944cb1251b9b3dc39ea03a810b5ca61c7b95c7f1360bc397c4d75fc26746cab5029f7736efdf
+EBUILD namespace-jaraco-2-r2.ebuild 814 BLAKE2B 04236c8843566e344ef988df799947778ae986e93d9ce3f96658536d51a84a6ef95aff3ac02f1633a71e5f9afde6bdc729b06cadd9d7c1ab1e3e9a654ed650d9 SHA512 4c44abbf7bb9983c95b7939b5f6a7fe8f11fa1b3718e77f31365278893ee637a2f27766c97981c952a26a7fef3a71541c728682e6266e4c5d87265227fb75bd3
+MISC metadata.xml 370 BLAKE2B 67898c03de570c517571354b8c619545652be50d127e6bfbe0a2425e92633d7da71fe5e23feff4723f3876b44401d2d82b3eb4f8d53bdff07c00e5c77800f15a SHA512 de4c56b89a7617367cb8d0083e83a7876861e523069b4c3a6f6c0a18b82aa3fbf151321472e045a5563afc583d3870f0e32321b0fead381b8e93e2ca45dfce90
diff --git a/dev-python/namespace-jaraco/metadata.xml b/dev-python/namespace-jaraco/metadata.xml
index 461777f87e51..243a15fbd9a9 100644
--- a/dev-python/namespace-jaraco/metadata.xml
+++ b/dev-python/namespace-jaraco/metadata.xml
@@ -9,4 +9,5 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
index 5c395f853ebd..782de62a1ae9 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 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 ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index 683be60bcce5..32fdc770f4fe 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-paste-1-r1.ebuild 811 BLAKE2B cafd9319b893e27c3b4459a0b139cd8cad54a2719dd738c841093a6a5008559c4263c17247cdfe4cbbeaf075c98819856001fa5533d4c141515e9657013a2747 SHA512 9efc44d303edec13892bf6f7811cd8d6147952cdce94635bbb6380e20f4544b0a63d556f4a95934335b826bc91a5ef5a4ce2d3772143951173cc1f2e06b2468a
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+EBUILD namespace-paste-1-r1.ebuild 822 BLAKE2B 65755f1d8ceb4a8dcda19943b066733375ae023675786c44a309ede728237dc5f9b42f9bfe268baeaae263936411b7a31f92567aa6a27c626f77987270ce0fd3 SHA512 7e099f98b6f8e40dc6472513080455e0d0736fdc49a938529642867a39202382f8f557c97b10e79ecfaf02d927f8eda1dfe3b825b98425166c77ca11c829b4d7
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/namespace-paste/metadata.xml b/dev-python/namespace-paste/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/namespace-paste/metadata.xml
+++ b/dev-python/namespace-paste/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
index 3483bf71177c..ba3b8655155f 100644
--- a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index 1e6e280689f3..b54ab96e24ba 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -4,5 +4,5 @@ DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e54
 DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
 EBUILD ndg-httpsclient-0.4.0.ebuild 786 BLAKE2B 6967c45cc141118acb98dfe34e4067553a0931b09fd35472c32aa5ec6dfa6ad5dfe132b1d565f1057f892791096dde0891414a467f90c35c86146f37ea23c6c9 SHA512 95faed72c02e8b2db8da43931b03aeacf217c358b9ca11c97d9f702ac097227eb9383db98c906c57b4de7b28043bec3e2c26f17666795584896ffed8469a463c
 EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1642 BLAKE2B 26b8fba6fc5fce373c2f9633d28f12bb2b74d6ec8bad90b497b675eb678440d408e9df97168bc3265c4d1783d9ea2337450ce5b606d1c471fd95e79359dc5100 SHA512 57d30e42f7892258da946454c3185f4ec0bca672a7fac4d0b5636892badaa95b005009fd8ef70aedfe082f655a0d39a5c50af0f328019efa1a3091df9db6dff9
-EBUILD ndg-httpsclient-0.5.1.ebuild 1155 BLAKE2B e72bbdebdcd51e22f27a04baee481e3cc6ae9a7092501dda21962ed42bbd23e3dfd4cca0294f3796a7ee7894a8b5e91fadbe562e7e7f8a42eb1e5b7ca018e7a2 SHA512 24f5d02fa2eab41cae879add46a9df5955773bfcc9454467fe1f88b21883aa910d1b984aadd0484a5ffa84c9708c49fbb36ed7e6fa58b275a5cbc81081d5f8fb
-MISC metadata.xml 393 BLAKE2B bfb003be060fefbbdd7e46aafa06dba5c0207726a303b4d0794a115b2995bb65505ceda29ad37f0cf6d86a8f1c0521f14a004869ec8d8051e374bd11255e7266 SHA512 1092b2a6c3d9ed56cc6429ce9b1ffeb14f18934f2dc8dc9e34b28eb9a048304f31634fe2d7265a599afd338033605c831290b903e933e1a1634ed8fdbb1719ae
+EBUILD ndg-httpsclient-0.5.1.ebuild 1161 BLAKE2B d6dff728fba2b7691821f0cbacba9120f5a801b501f12c141223731ca747ecbe6fac3bb82083e332520e3e310151a0ffe13dc256ad5cbeaf2f669483763d1c4d SHA512 fcc39f528db7a8f16d3723fae68a71623ab5d803cc20ec84e7549186f8632257bea39cd890e1302a5db176ba171e727df242ac59d9545d81f0364b495e04d2c4
+MISC metadata.xml 418 BLAKE2B d8bbb595e8483ff5072ad8bb4dd0558aa87e0bcc9b01dc59b5816c42d9e465ab1bbfcb5073479a06b58a2bab3d637e4ed23abeaf899c5c5be6edda057afd123b SHA512 82ae35467b503a3fc7e5382efc7f023917bcbf67b7bd9ed2a01628c76865154e46ffd9e2f7f7eefe6a161c745d0da92585082a27b88b5e957839690803e99de5
diff --git a/dev-python/ndg-httpsclient/metadata.xml b/dev-python/ndg-httpsclient/metadata.xml
index 9946c2697cca..cbd5a83a3714 100644
--- a/dev-python/ndg-httpsclient/metadata.xml
+++ b/dev-python/ndg-httpsclient/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">ndg-httpsclient</remote-id>
     <remote-id type="github">cedadev/ndg_httpsclient</remote-id>
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
index 3f2b0667f41d..9a2da09643e4 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/pyaes[${PYTHON_USEDEP}]
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 315059766b35..fe0a2eff5b49 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -3,5 +3,5 @@ DIST os-brick-3.0.1.tar.gz 189358 BLAKE2B 331e06a49afa6d973149425946ffc3fc2b2173
 DIST os-brick-4.0.1.tar.gz 192821 BLAKE2B da1037e33288a3a20c6858b8620c5905c9a1d218ab858659bce844445d6b33a9b9c629df21eab68419e755bddebc43bf20afc197eaaf4a29dcd7365d19b27b0b SHA512 7847cae82e1ef726eb1189d93f13325d57abdb52286887d6b55e256d9a9f62b0afe71580c5ff30008f5827ba76cac8e423ee5da0d2d01f5794fa3556a6c2cc64
 EBUILD os-brick-2.8.2.ebuild 1458 BLAKE2B aadfe1bb39d49f87e8da9f8bd14291eb8d414a1b38acca29fd12022fec5c0d58a944a46bb2eb29796ff65fb9a417fc2cb2e6493ca59fac90557891367e88c55c SHA512 46ff984e089bd29223627f368b31ec34e60ffa42fb22fe64525b4404de638dd8d9c6cbf1a6906d4a9bd68520bb7f31f7f5d19e6354f03fa342bbc89ba54eb73b
 EBUILD os-brick-3.0.1.ebuild 1598 BLAKE2B d22959e8795da0fbcb48f9ea06385585846d25be8713a3dbf806e04249670905d63d2b04dea87b1fe4369ecdca7b62c5f0fd3fb8739887a2014bf9a5988bc75b SHA512 355331e77ed709f4f7306e349afee02191256bef8f2c80ca7c3873cfe35240a5f65d53cdcf9246c969e8dcd759ee50f80b4305ce5735c55bb60d608e1739d3f7
-EBUILD os-brick-4.0.1.ebuild 1220 BLAKE2B cba1a0599e63e87d148c6c038583d9cd8b90b4f198d2f80758cd4c366dd3bc5e002d63a757fa63e946db58c97b67fd81525017b0945e22f62628dcecf00021df SHA512 0586e374965576405b7dc7ab6869f524434ce2e974178f87197fd13268b24b1274a2f66b6d4a31dd3f898b784288aec39c3e25d538bca41739be3ab0a2181e54
+EBUILD os-brick-4.0.1.ebuild 1218 BLAKE2B eabb2f15d2b80fa9fb548cf4e0c0c98f1c4280e198298c6e71ea11a5ee90ade7ae465db36dc95b7498d251a1a8747d3b23d0cf19ecefa64bf101fa922436ef0e SHA512 6cade2a5837947065d64acdc01f437a5d64b8b54599001fbfc981f9567797d8a635f99df1bec21c1424797b7ea63bcab36b9af0df9a21a4be1e567ed78b71ddb
 MISC metadata.xml 405 BLAKE2B 136d3cf6a74f9d90ed05a9c80e83b168dce1012acb95f9c1281410894d695994318992798e719639d63e36c466d8bd66ac2f67eeeaba720f18933e0a65167cda SHA512 4bf564ca91331cdc58c0ab3f9f372ee155947124e43e4d44dc38d7aa4ce8c1a043537ec262fdb793759bd50ad8ae213a2817ca41dc95618e138e3523432be6db
diff --git a/dev-python/os-brick/os-brick-4.0.1.ebuild b/dev-python/os-brick/os-brick-4.0.1.ebuild
index 64fca94f9bb9..12b80504c96a 100644
--- a/dev-python/os-brick/os-brick-4.0.1.ebuild
+++ b/dev-python/os-brick/os-brick-4.0.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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=">=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index ab7d6bf97cb0..cab7662fdfe3 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,4 +1,8 @@
 AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
 DIST packaging-20.4.tar.gz 74402 BLAKE2B 3c667c1605445aec37d264ec3846a1a6678f13a12aecc09a6d16e09ea27041fcd65d23538acef4f6272ab0458ce479c42906b15cb6eddd9c8001b1970c23e4fc SHA512 d53912041a9950efb5d221fc968adc328c2ef1e54ec9806d2158fd6db1b170e37afb05213f5750b10c59927504083ca3781c958caa0c802b1c7c0fe1ac1682a4
+DIST packaging-20.5.gh.tar.gz 75111 BLAKE2B b088b85fc042b48337878c0f663934f32f90eb792ba53257b1b0879a097ef042b67a9cff56b23f5e0187a3df0f89092e0210939382851f0ae917f6ef00ad73ff SHA512 ef3c4853c30d9635b9372d6861cc0df8f7fc5a1d784e5f3effe3f315da0f24662ac939e70f55c6e9bb8864da95b9f75bc0df093f12c0f5c2af654b5354a5f081
+DIST packaging-20.7.gh.tar.gz 75182 BLAKE2B f3ba27ec33db576273609f28aabb5edab4acd07d8174c96e3a1608eacdc1a571d2ce96cc4e38c50c964ae5a716bbca077effd6dea039b25ac7bd6ce5707ae08b SHA512 4da8f66af066ac92b47664d21af34a02526cd1639cb766927670bec0ac8c7416116834c847678a29862a46faeda7e2f2393744be315cdfbbb8bd55a04ceb942c
 EBUILD packaging-20.4-r1.ebuild 1403 BLAKE2B 32cdfc7e75e27420dc234bbd1695b21e8b7183941ab590d6eae30d16510d93f323580c19c0ff00da78c6c352e8fd82d610dc6b5bd2f913c7d277c71126b0fc0d SHA512 9aa1b1e682839c0d23f514fd66d9436257b77c2cdcca975106e544ff057d71f84d8c52c8d108d2b996b7341669a07cbf98c64eb37754a6eeae473312d93b5a39
+EBUILD packaging-20.5.ebuild 1012 BLAKE2B 8aaa25b51d42e8ead7aca7ccc20f2fe2f42a00a152bb9cae41a1a724b41af864252e4de09e5a395294dfe6e950a789e06379cf816e2c607687747b1c451103dc SHA512 6f104ac4154b63e8715f44a43be0337e55d565eead686283b795cb5ed66e31ae32607d1039de3116a327ead44575beb22d039f93942ef0adbbda961d6c6ada2a
+EBUILD packaging-20.7.ebuild 1012 BLAKE2B 8aaa25b51d42e8ead7aca7ccc20f2fe2f42a00a152bb9cae41a1a724b41af864252e4de09e5a395294dfe6e950a789e06379cf816e2c607687747b1c451103dc SHA512 6f104ac4154b63e8715f44a43be0337e55d565eead686283b795cb5ed66e31ae32607d1039de3116a327ead44575beb22d039f93942ef0adbbda961d6c6ada2a
 MISC metadata.xml 390 BLAKE2B 98afec1f8a7889d12e1a44ef1ff2bf1db635818b7fcb8d86dff0d820fc8fc92920615cd5de63f35cbb6eae6c29f8d6942807f0a7bd48b320c9a0d55a7fa0de69 SHA512 d082f5d387c5d71f0f6cfca4572d4637081daa863186d8b05050738269559617b910c95de97ac3eddd41434cc528e34597125a6973b7b239734c91bb2c588235
diff --git a/dev-python/packaging/packaging-20.5.ebuild b/dev-python/packaging/packaging-20.5.ebuild
new file mode 100644
index 000000000000..6d1b30fa1a72
--- /dev/null
+++ b/dev-python/packaging/packaging-20.5.ebuild
@@ -0,0 +1,37 @@
+# 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_{6..9} pypy3  )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="
+	https://github.com/pypa/packaging/
+	https://pypi.org/project/packaging/"
+SRC_URI="
+	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	pytest --capture=no --strict -vv || die
+}
diff --git a/dev-python/packaging/packaging-20.7.ebuild b/dev-python/packaging/packaging-20.7.ebuild
new file mode 100644
index 000000000000..6d1b30fa1a72
--- /dev/null
+++ b/dev-python/packaging/packaging-20.7.ebuild
@@ -0,0 +1,37 @@
+# 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_{6..9} pypy3  )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="
+	https://github.com/pypa/packaging/
+	https://pypi.org/project/packaging/"
+SRC_URI="
+	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	pytest --capture=no --strict -vv || die
+}
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index c175ed2c17e3..44f93311e8e0 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,3 +1,3 @@
 DIST passlib-1.7.4.tar.gz 689844 BLAKE2B 38f616105ba70cf93cf36383c73f2a4da7bf66ced2844effffe74d9f7c29ee0aece5652974dd1414f16e32fbe6957e2e921cf01bc59daa70195a6d50a4a3bf2f SHA512 350bd6da5ac57e6c266ffe8bf9684c8c2cce3fc6b513eb6c7bc1b302d2d8a1b701e9c01c953782520a2ac37b7ec1f6d7bd5855f99f6ee0e2dbbf33f2d49a9530
-EBUILD passlib-1.7.4.ebuild 931 BLAKE2B 24f5a43808adce071d8ae87b393e21278a927efd0533aff63ec107a0b290657a419b2974ddc51adb81d07eccb7ce9f51421f4ba2178195d497fb980549c2c8d6 SHA512 5d81b418e6c7c711c4b74509ab50801a484d21f3a437d893c945fb62a416ef763214a20038f1023acba3af1105cbbd466d2778c8470133e331481c7aabfc4f9a
-MISC metadata.xml 735 BLAKE2B 7e437ebacd95fbabf9484546eb1dccca655551a0d437c5e633b1504ee2fed7ec9de2ba0ce9eb6718f9eca7aec1858b2a5183e37802f7786b5bd4dc4e901f6109 SHA512 09d237f8d4b3ca0b5fc3d308ff07f8aa4bb5c1c66a26672aad42fbe9991e2a531f00f39447d5d9d5865b441754e52d09c7fb32bacbe35928bb93567559837ce2
+EBUILD passlib-1.7.4.ebuild 942 BLAKE2B 5dc03fa58be0842db005a18b297b06e57dec17587f657b079aeeb41d116cf652e29a1ef46c26a265a6a868f7ce2276b236dedcb69adc113bdcf60f554cc6b0cf SHA512 d200ef6f17d1770b86ffb55ca85ef4aaef6609ea31c397b9f4b1c3dba0a1ae38fadb83f36aee98e0e2bfacfa1ff737b04fd3b666d678f949b67169dc9c9689df
+MISC metadata.xml 759 BLAKE2B d38105517b388dad196bf6012214c4bdc4157896b8e6c5fd63441486dfaed1d8e9874fa892ad4376bb753ab82ac739500629e889bea5d9795db922616e6781e6 SHA512 6fa983f68d9d8a67352567dc5e7f20a42761ea144988e7a1dba8117e19f164fbee9229f14308cbd53ddd4dc26a52774ecfd52090a1f75188ea542ca184a0256f
diff --git a/dev-python/passlib/metadata.xml b/dev-python/passlib/metadata.xml
index ddfe55c4aac5..8a2d7a8de2ab 100644
--- a/dev-python/passlib/metadata.xml
+++ b/dev-python/passlib/metadata.xml
@@ -13,6 +13,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="bcrypt">bcrpyt hash algoryptm support</flag>
 		<flag name="totp">time based one time password support</flag>
diff --git a/dev-python/passlib/passlib-1.7.4.ebuild b/dev-python/passlib/passlib-1.7.4.ebuild
index b032c5ff2bdb..e2c53054e51b 100644
--- a/dev-python/passlib/passlib-1.7.4.ebuild
+++ b/dev-python/passlib/passlib-1.7.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index ddfa7cc57de4..996a81f656b9 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,3 +1,3 @@
 DIST pastedeploy-2.1.1.tar.gz 32339 BLAKE2B d11affa480e5c9b7be53d0431090e4ec9d66f8862b1aadf6a993a09f9c952380d7698eaa7442614936a8316e2ac50404a096bf64bb3ef31f55cbee35b5982166 SHA512 0109e30cb5ae9bdd7f06a79f6236c90f96c3bcfe507258572b1329796a1821486d9762d954673ccbac76ee63c6a69e64fe5e2cae5402fecf4a5affe88cf46930
-EBUILD pastedeploy-2.1.1.ebuild 980 BLAKE2B 23f2c9b950485d79c25ee54279daecb333e9a261d5ae3ba15b8f1ffa32041ab1b9c748bd3e53302188706633dd12cce5559d1dff1349eeb6399f6a10b2938ecf SHA512 f0a6870069da1e1969143480665aa26c250ecac74614e20e4f39f3d822f8374e3545904b2a6356e212004ef39ed2ccd737959410da3d132eee032199f19fa427
+EBUILD pastedeploy-2.1.1.ebuild 991 BLAKE2B 64f941d0846037ea993f5a0dd97f1fdfba978139fccc525ceff985efef57d345c73a3eed16ca1065efe28292f92fd6a400c5d44ca9f840a1ff737ac40ff68703 SHA512 4a59a80722668201214db9c2323863a1bc4d8e32017ceb0c874ab6273ac1b82b5db1884191fe1865b054029dbb52b8cf67094983cf47aa7764dd0bf652ed3280
 MISC metadata.xml 830 BLAKE2B 646965e3c4e9247a8299b8e3d441e3a80a899107e14489cb1e7f5c85bef9b4c710536caf7cf6f695e9a87f0412cc47b7099312e7e7772691a275c3c2151215c9 SHA512 dde9cd21ca86242148ab89a2e77c88c4f7ec30c1615831a2cb00b20f0051dd23c40537ce1abea7ebeb39da4a8233275f0d3dc91a8f3947307d7acd571f56dd29
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
index b3184cd1dd90..5296ae59182c 100644
--- a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 52415e1d59bd..d7c253b6d79f 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,3 +1,3 @@
 DIST path-15.0.0.tar.gz 73642 BLAKE2B 186b77b6571dd878a5b64b575289bb5ee549145ccd0c7b858f99c9e3772cf98f2cc7ff5da759e7fa660296abc49c053a388ad95466c51adccce2162c682c6566 SHA512 e41684c576b959e27258f60c0d8b69719c38a5a7a04d9646089aea91227781573368a08f01230dca831732ae687741d22caf52efd9a481378b8d4e77627fe3a5
-EBUILD path-py-15.0.0.ebuild 1220 BLAKE2B 853fdab38de7c0b846b7ce1ac61b3f2dc04683e95db199b0b7c9268a5b870049e0e5f93db8c6683f657e1b69a0040f256105caf8329ef168e34f8a62a2372532 SHA512 d720de9a1124c4cfa3f2303826c260af674b88330c4b6ac11a14e46a680c724defed4592468608cc209f093ad1a5218bc771c7e2343feb3f5b5ea477eabed8f4
+EBUILD path-py-15.0.0.ebuild 1231 BLAKE2B f895d1549408f31ad7d3514b1186ce75e7a9402177c5ca8e0ffbbaa19d1f73772bdc5e43c4b289269b772666c3444ba7a0488a2fdfd3fe94611ba52463879457 SHA512 d5a71f266529e9f53bdc1c1f05efa736155ab4f5da51eafcfe40cbbd98965cc53e3f4b843bc1c2e3c03d6287187f2d4241e7a7142eae79f855006120ea52259d
 MISC metadata.xml 401 BLAKE2B 5a8d84aaf65dc91b75cd7222e333e75f9bd6654ce4f9d55c91a8d28b141c5fc982b8c8a6a0b3b4f1c04fcf05fa56b13725062233961f323383110ace44089da6 SHA512 415b7917fd35598bd39c03ec7ede5e0e13266927b73647a995abb62d56004039aacebaeade95be39a265ef3944c35f3c61145cdb2100e563d8125753547bb729
diff --git a/dev-python/path-py/path-py-15.0.0.ebuild b/dev-python/path-py/path-py-15.0.0.ebuild
index 1389d65eb266..11c26634ae02 100644
--- a/dev-python/path-py/path-py-15.0.0.ebuild
+++ b/dev-python/path-py/path-py-15.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-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 ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index d7f3f35b99b1..d1df4d2b22b8 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib2-2.3.5.tar.gz 34393 BLAKE2B 7e03214a53f1ebf7718d04f653e24ffa4b06070b0ae21583d98ea0ce956c5aced5ea63bf6062d8e8d979bef4c82137cd2d2d5d6121dc3dda0ae1f713c1868d36 SHA512 3f0f212bf5208d0965ac02a590bef6ac0ec5e3b702828c06c3c9d37119b3db422cc7873de614fdc37ebfb3f52239a6517008d9672a176ca15d03fe13baeeddc8
-EBUILD pathlib2-2.3.5-r1.ebuild 868 BLAKE2B f8b8b91545139e9d1edaadee5412767f0a31a4746fd40d152cd46679b269eea142bc530f60fc6ee75e6351dac62258ed3101e8cb14be02bb246cc27dce14dae4 SHA512 d275b2a3d5aea0b36a584163a969fab69494fc9171fa338f7c7c8173b73350f5dbbc577885e9118309879fb3530e87cd9ed3ec0017f50e4771a6adcbdda8c448
+EBUILD pathlib2-2.3.5-r1.ebuild 879 BLAKE2B 6b4f2d6ef0a2605fbd4f5496f39eb7e3e473222103938d28e65c5e092a4ae871a28c0354176850db7ae131a72298195575bb454a045c9a5aab1d5a03774b9135 SHA512 0243f34d44581fb350aa99b26fe464e51157f271f50a405386dc9598f026d3810a521d8bb4a1f9a7a7ad2b11d3ef36c09090d60b13b1731214f74a39bd9d23a4
 MISC metadata.xml 463 BLAKE2B c5e8381d9902bc251a106ec336aa4981170fb7fedf69c4b71ddd884a7e9389d906fb9b51328b80bff434bd69f8103826783fc12f827b30866a1dec5405e63c98 SHA512 e00cb650f5e170feb4186dd440ee85e28ce345447b16264e323a50ec719b19c68bdfeb5c691d468045aa1c57df43e5b12e569b410ec04d39d2d6d1e1c61e2003
diff --git a/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild b/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
index 36f159e9e542..fc561c987718 100644
--- a/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.5-r1.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 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 3278eb59c04c..2683cd3907b4 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,3 +1,3 @@
 DIST pathspec-0.8.0.tar.gz 26256 BLAKE2B 3d4f2238c515253d83bfd17a2f3319e38024d4fbb22fb0f078bbcca73d3aff45f246a35752c4039b0d88f204ae49b4467b2d9e3b9134e14a7a171895dac770be SHA512 e0cb1883d11506b3d11963397db98a0fd3411f56df7c3e2ab3ac44116ab53977112bb51d1918591afc48b9c08f9cf997d34beba373aafbfbca2aa8749ffaf6c8
-EBUILD pathspec-0.8.0.ebuild 554 BLAKE2B d0e10c970143392d06742308c113c6a6258724abd33baa9f97e59344ba2897a105872d288ac5bbf2f4b4dadbdaffd229e2552a65e3f37459c4bdc9eb3119ef47 SHA512 ffcd4edf0046715e3e3b504eacfc7b89c0f203812484ec19dec350e4d374529d65f8db8f46c3c60475ed6d596fd282da9f304481f61707f29d2d06a1f435dfac
+EBUILD pathspec-0.8.0.ebuild 565 BLAKE2B e71bf61b534aea37f91bb49aaddc1b99a1a0f0d8ffed77a26c896f280dc9fba69fd686e8d134ea6e2a3bd72b6a38e752c98cf2da9f4b8708c6ef1e95b358bf82 SHA512 5b64370aa4303c203d7a8eb947e1640aa6dba24abeb750fc36bc588eff3552fcc33d79fad516ce18ffd4f0c749579fb8b9240edf30dd7eb8ee2210b7f34c8bda
 MISC metadata.xml 421 BLAKE2B 388eb128b62746868b4ceabca9cc533b64ce5d5cfcf5fd70b235b2e3f569148b8de15443dd9f7406ac7a050dcda0e73999f3451ea51f8a7b7ccf979115ddcd32 SHA512 fd54f8bd2c7ef1515c4f4dc936b7de16c8efaa5c81e0ce313c719172d61874455c342b6c4103b5528cc423624d04cd236aa795d5adecdaa106f7f42277e5ccf8
diff --git a/dev-python/pathspec/pathspec-0.8.0.ebuild b/dev-python/pathspec/pathspec-0.8.0.ebuild
index 65c3fd6463f4..79df7094b9a5 100644
--- a/dev-python/pathspec/pathspec-0.8.0.ebuild
+++ b/dev-python/pathspec/pathspec-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 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 ~x64-macos"
 IUSE=""
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index c292ea03ebf1..3fa1ad9a9c1b 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -4,5 +4,5 @@ AUX pip-20.2-no-coverage.patch 6154 BLAKE2B 743dcacd3107d9c6447197dd01bc85b1b16d
 DIST pip-20.2.4.tar.gz 8723163 BLAKE2B 4b892950b6752b61af2f6a9d2c0a6f5db124cb7605d6cb9d4787bdbd88911cc6013474dd299f6eb5b1af4a8fa0ab6d3c5253513af182045a50cb463ced8382ea SHA512 649fdc6baa1ebe741717bd1e5ed8f2450d79f8bc0d06f2804c27488be9018f6fa6cc2eccc3ec2801442073f59ac0b8c377612c25116126aa919aa95050f4214f
 DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
-EBUILD pip-20.2.4.ebuild 4152 BLAKE2B e91199206e94eb1b3a83a9aecb20d53660fbf118963ca7f07cea0093a1176ea9aab450fdcff1f2984a77743847ca0fc08aa67bceb43eb75608ab0cc1217c7ef2 SHA512 8f9e73d690d8e318038891ee42d0b1550eeac5e66cc7d0a09ddd4b46b3c27c5d2eaa6ac6d0e509ee29f9a3f4f6d90f7b0319eed87a1e45e0bb44fb547b63db02
+EBUILD pip-20.2.4.ebuild 4163 BLAKE2B cc26eb182a2e0c9c65946a251f9b2933b6a4622482bb1e434a278e1d103c7be044c23de588f5f79f487160672188b76dc580d1b5881d09301aef80d12873ad3e SHA512 403c5f8cf7375eac81ee208b3d5ded807a0c925a5e9bf95f54d17d3444e830e40687bf652657e58700bd71fd571a64298f5f321b2d69000ec75335d6eeac4c76
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-20.2.4.ebuild b/dev-python/pip/pip-20.2.4.ebuild
index 9288626db89d..76d34fa07e84 100644
--- a/dev-python/pip/pip-20.2.4.ebuild
+++ b/dev-python/pip/pip-20.2.4.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 3e59b670de7b..9cc7350a5430 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,3 +1,3 @@
 DIST pkginfo-1.5.0.1.tar.gz 34496 BLAKE2B b5a60e3fe2408283afbdebf8efa709b7b1c96b82ddc76b3fbc4d58d544c2170de1434525fe2e324af9864332c6570885b05a3d8ec2c248fbff20984d2ee80a94 SHA512 319bb403970affd5a4222dfdb3d17738630d1350ea84e51ad1bebc6c8c72e0dcfd69a4eaf5e7bd156b8e605d806357922c05cc994dcafb01b7a33c617b2df447
-EBUILD pkginfo-1.5.0.1-r1.ebuild 706 BLAKE2B e709326769c28017292dc944c193b5801c13f81030f339da7b628912f2047dfc4a0a8211b75587eb9ca14ddf27b3abb5e36b918ff189571b7e036b9347511732 SHA512 e8303926e3e157e9fbfe1aa1ebb1dfc3edf3a0ea094eb06e933d1823d3121183bbb810200e107d45a83ff0c5a634c7e016f062db2750aac11e501a3e9c162af3
+EBUILD pkginfo-1.5.0.1-r1.ebuild 717 BLAKE2B 3a483c01722fa1122893a64687f39a4bb8ef6d4df54830e4cd8cdb933ed450e395ebf909615fbc822fff0248523210d61c9ed617048c60d6fc877bef93c595d3 SHA512 7e0b8d6d77c677c367373fba30feddab763742d0a475b94bfcde1e80a1cd9d13ed0b267d5057856fe3b3c6b738a4c8ffdfc4c7a1669c9f932ed07acad3637019
 MISC metadata.xml 345 BLAKE2B bae902e9e5c7357ce7df1d26ddb2c4c81ca0dbcf4d17eeef7127a49cc4a17794ba29483049ebd5518df71e18258c4ad375a90e0bfb2052fa95a9143431095662 SHA512 f970952fd577c2baadebf824932c4e825d962a497d7f41870a6d51301a5776d22809b923efcdf2ecb38322e4c53e11dbeb5083660ff0f93a3c301a88bb807151
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1-r1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1-r1.ebuild
index 2c7f3e66524e..40a835850ebb 100644
--- a/dev-python/pkginfo/pkginfo-1.5.0.1-r1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.5.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="doc"
 
 distutils_enable_tests nose
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 4a028e2550bd..a39387189ac4 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,4 +1,4 @@
 AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e956759e7ad7ba3e50c0b0955823ee40d4d95ee85c864bd144104dc2a39cea03aa29ef05f799aa28c14763b85ce3c696baaa9cb249c24 SHA512 031e021a9dfda5b64ef8fcd077cfd6373d2e47bb0d989cc31c59ade70e6d31336b7929dc2e55bd675753487b124f3acd3803f14d112080b67f7e2766c4594364
 DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
-EBUILD pluggy-0.13.1-r1.ebuild 739 BLAKE2B a47546a45b3321d7162427830e5aeff662c2db8856fbdd4e795426a5440503fd88107528c256bed0b7dc940dde60f7b9828377e3b93991ec703514b7da54b48b SHA512 a9331f2c03f6892880c09abaa35e7df0aff10e10b6d22539d2899eb1d3a81a58d76a8929dc96b1d46c978d08f00cc4d60ddef845802093834f0e727dc6b4e17f
+EBUILD pluggy-0.13.1-r1.ebuild 750 BLAKE2B e8dd8f951b110aac1f93034325c0d70958a6f1555b2b8241a04a533a3442d9a0a8573a2aa278373ae4ffb54f462de6dc2b611ec5db9744075fc86b92ff174d39 SHA512 16b9fd1fb2110b198216db7d640f47f395075280cb065b3680085c0878eb021d10329cd8ebb9f2cf77324fe1d09b7e8d293abba2d4983d2dd9f3414ae4fb0b6c
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.13.1-r1.ebuild b/dev-python/pluggy/pluggy-0.13.1-r1.ebuild
index ebc08ef1ab0e..df10eb8d1c10 100644
--- a/dev-python/pluggy/pluggy-0.13.1-r1.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.1-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="$(python_gen_cond_dep \
 	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' -2 python3_{5,6,7} pypy3)"
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 0174b8c696e0..6e79654691bb 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,5 +1,5 @@
 DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
 DIST portend-2.7.0.tar.gz 12732 BLAKE2B 147d47295d702e6e4a41da1af91afc72ecb2a29713431aada6c98fe527c96f86a88a845cc1afe6507e2fd0d749e146f8b349df13d2e1fb1ff2c0a12fc7d6bdae SHA512 8c81e524e94c4902806a6d33a2811d405e6024796fdbfb5ee1037a177b0aaed4c1b87b76822eee5ca55e552ffa569f4e619d0c1645f0d10c17f8d721ec73787b
 EBUILD portend-2.6.ebuild 930 BLAKE2B ce9938e70cb8ab428a1c079dfa8c528fb1261808c1ef74703afa2905364915a318cdbca09c3bf54d7c3a7ef7dbc487c39c5a8a446d80c584cb17a85e931a8916 SHA512 2307f4b2848ebb21f5b50851ec31bcf7b07a5d0b57803e1c235ecf8140927ba712baf98aae91ffbea98ce10c4db2159c9a38ea4e1795d71bcf7f296be3415e63
-EBUILD portend-2.7.0.ebuild 788 BLAKE2B e34540739d40b8a18aa6485fd24b8629bc998fb0c634c317669947f46ca5b6f2ac705de50bcd46838ef8a55d4a9a940bd8401b47828834001ed759b05702c3e9 SHA512 57093a860131a12c5e7cef9bf6719a909e84583faeb6e14a6a40493aaf9421c73a1a998c2d29a3d359c2a20695ee295c4e9559d77d73f3f2d81cf2562dd4db28
-MISC metadata.xml 469 BLAKE2B d4b527da8fd402a1f9099000265ed003555c4a6f492a5d9c0ee5c350af1a044fae6505b6f847d55f45eb4551c1dc6f1ac8b946c6ab5b68768bc583521fc4a485 SHA512 3ab794a7c4545b3d5a5281499ae87a0ed377bf7f83acd0ab8bb2eedddc3005f03d793837ef9aa8e681374357067a5edf7bcf50da48c0b5d36bf0696d8bd2353f
+EBUILD portend-2.7.0.ebuild 799 BLAKE2B cfc9f270726410c841d3ec634ff4755a13510183a02580d56e497e21d3480ce16ea91ef841a47942caa8b20a471d6ec41f4552f2e0c68a3daaf237a6552eaf3e SHA512 924a784d28609792e415148602c980dbb74d2b072c3a69f08dd68c88d2504c98f023456f54d9fcd40eada9ffdf949bc15abd2e259c684bd5759df5d54f0f42cc
+MISC metadata.xml 493 BLAKE2B bc4d9e79f1ff9387da6705744d7fce19c8b6cbccfc62878ba79b14312b3612598c6042c5f2842f663af254fb8977a60c34d373624604b69ccb2f861a2f5aeb56 SHA512 7db9144b99d487353a90f70e85d8800418eb92aab0678e934ffe92498c7b0e4c0f574dcf109f1a3ec2c7478174a26346152f15d57f15c9edb89f5d9dae2c788c
diff --git a/dev-python/portend/metadata.xml b/dev-python/portend/metadata.xml
index ea8f0ccb5cc1..570d97847e3d 100644
--- a/dev-python/portend/metadata.xml
+++ b/dev-python/portend/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">portend</remote-id>
 		<remote-id type="github">jaraco/portend</remote-id>
diff --git a/dev-python/portend/portend-2.7.0.ebuild b/dev-python/portend/portend-2.7.0.ebuild
index af060ba544ef..2d080d4a15f4 100644
--- a/dev-python/portend/portend-2.7.0.ebuild
+++ b/dev-python/portend/portend-2.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 11f46b964b25..feb19c544872 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,3 +1,3 @@
 DIST process-tests-2.1.1.tar.gz 11522 BLAKE2B 6f6b97da73f1e4f449c3c7f85a6d860611de57e78cb57c352ea4563be07d7866a5c44107fae0ecfaad24b262c933806b59c2c9218be959b2576fc0d8250da4b9 SHA512 4bb520074a9964d3eed4aca7a1952bf1a0d99b475f3f61b5c51137d8f2e804352639187da5b5ff30ea8739466200eb9361e77dc3c43a20d5ea418f63a2765a1c
-EBUILD process-tests-2.1.1.ebuild 635 BLAKE2B 1219068540b47168571cb36d28afdfc308a92fdbc46ffcd2266f70da9b5c96d749b2b5ebf75984219303b11b0d055b84d262f9717a0235facb628106b8e681cc SHA512 3993ca525a7b700f1cef848b0513f6c0ffdc4854802163026a45a79be0044edd5eb942b91d20bbab90b3899c93066d117f528d82239809ee6ad036d4682c93a9
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
+EBUILD process-tests-2.1.1.ebuild 646 BLAKE2B fb32427bb1f53b8e48dd47c4f9e0a6c04a6df80a85ed64bd8df380e6931a32e1124d77331c0803feedd88d551e6297bca1eed3dbe08cf1133a62e9aac853cf8f SHA512 be6d91e83d86a15e7564f9eb35deb66e59d1b815a9e5a2f58096f52e1559f1335a8438f5b85605d71c3b68547a3c467f2ee97b9d154bfc8dccd183b92f2b1418
+MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/process-tests/metadata.xml b/dev-python/process-tests/metadata.xml
index 7f4f33c6dbc9..4c43a15ce6f4 100644
--- a/dev-python/process-tests/metadata.xml
+++ b/dev-python/process-tests/metadata.xml
@@ -5,4 +5,5 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/process-tests/process-tests-2.1.1.ebuild b/dev-python/process-tests/process-tests-2.1.1.ebuild
index aa3c1468da19..dfd2fc63f1ff 100644
--- a/dev-python/process-tests/process-tests-2.1.1.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.1.ebuild
@@ -13,7 +13,7 @@ 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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # There are no tests at all, under TODO
 # see https://pypi.org/project/process-tests/2.0.2/
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 17cec4fabcc4..078f4bd14cb8 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -5,5 +5,5 @@ DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c
 DIST psutil-5.7.3.tar.gz 465556 BLAKE2B 6a9f31fcba571f381c1f4c904a9ff65659d13ed64e91df478aa7df4dabb87a35c4fbd9c0491a3d10b9eaf0fdcc8f2407fcf7144e729043eda605dfe6e6f93844 SHA512 8fcff56dd4e4c1b877c09023721e6f562424f7f84ae5304d518976a1e7f21dd026772f1abfc063bdd0857a375bc869f42febde090dc0b65918d1ebf44e3ad71d
 EBUILD psutil-5.7.0-r1.ebuild 1152 BLAKE2B 323f280e6860ac70a1f026eed3d514f3fc179f9eaa17a69bf229eae00dcc69b157a89b719e3a9e8d73ed753742dfd88f371d026e7d4699eac9c6027b9f779c9d SHA512 a25c28addef5ef2a22931913fbeebfff52ef2d1ac55c30b5483a8c507332c962f35abc683290efe22f23451d22b62b7e5c42a585866d42d3e0d36ad18cceaeb8
 EBUILD psutil-5.7.2-r1.ebuild 1166 BLAKE2B cf1f1e128ca05c7aef5e7e5ac71f13131cddedd966ec6a7b148c0318dc8a50e6e5dd134f7cc825e238e1a0cb28d0b5eae9c6143b3e0188d8ae6fcfb24a413cf0 SHA512 f24ed5db1f7a5b064ceb372db3ff2a9ef823bd14118f4d78dfd35ba42556f64d6b708b23dd5ce359918fd7876381582b67afcc07282201ea5d5acad4bf97e6a4
-EBUILD psutil-5.7.3.ebuild 1164 BLAKE2B 39c368194e8d19b83ebe964acd0f0cb079818be67252d0f301d4662af19fb75542bb500f72800ff34f7f229b8b245b508a660abc1da332f67eb5a5b3f8fffcd5 SHA512 1f43d6f8779fcd0bd5a72f5fa085761c66d7868c6e39ef77e98af3d7c571fbc68d8d94737c16fe11dc24d24f40793a21de4f5ff20dbac90b9448294c7e2c105d
+EBUILD psutil-5.7.3.ebuild 1163 BLAKE2B 87b1e28328043ac061badd18effa9065c2cf0dadd4bb0df2b32fe0275fe035a35cb25ae4ce2b117478951cbe695968baf2b728b7a21f3e8ca40a9396c77beb1b SHA512 229ff532170979280ae5c3382ed33ed0cc340a0bf4b72cb1d06f6c972dabb5b075025bce921de404cf20a80bda4f55ce6a84f8a094fc4a3cfc4035dfaf3701a1
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.7.3.ebuild b/dev-python/psutil/psutil-5.7.3.ebuild
index c6e735c5f828..2e7ad9a12ef5 100644
--- a/dev-python/psutil/psutil-5.7.3.ebuild
+++ b/dev-python/psutil/psutil-5.7.3.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index 9b333507d5c6..b1c82c31250a 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,3 +1,3 @@
 DIST ptyprocess-0.6.0.tar.gz 70115 BLAKE2B 02499e560c4df2f852d0951a9acfcb88a2bfe659592ead0304bb6a240e831fb093dd40a457714a8a91d1af70b5364b7af91d2c14c956d8a84d3eeec3eb2a9edf SHA512 b34b6bca977f09d1443b210e338e1300e12d6ef35857f9543b3a116ef3b500ad4844357a7a283321756f886af41bddb1f02b27bf200ef1e82a96fd9e431bed86
-EBUILD ptyprocess-0.6.0-r1.ebuild 528 BLAKE2B 8421bccf825500670e334ab229984d7b52f18096e872fb2a936844375afea4f3c57b0686cc0ea4ad7cf3b5991df09b3c116fc3935c2a7be726af9c747c941f3d SHA512 fd30bc1a40bd4fff1549135c713ed345ad9f4628665d7c3a1730f74a743c873a744fe785b3df91c7cfe60e2e1ffe1e926c194219548aa13fb3aa40a3d6e01d29
+EBUILD ptyprocess-0.6.0-r1.ebuild 539 BLAKE2B 8c31d581c960bed8148f21bf2236f7d2ca969abbf67cd793ebb18d6d52ccdda1438a93a822419a43b030ee685fcef6f5560285d553c0226c4531e52fcd049c40 SHA512 12939018bcca432f6138b1d0b50720a03900371066b6837cf3f3f5dd8ecd52ee6500f636be96fc73de348bfc4fcfb6bb373e8d031cd92f754f699fc4a24a4970
 MISC metadata.xml 383 BLAKE2B 03c99bb4daff695f738e75605fe765379ada90b822ded3015bd82e3e34fff7ff61699978e00dd615d2ca6684567b3d072316debbf66abb0c6f9413ff2e3ad724 SHA512 4355f5b56f756ee65c09bcc3647050e727abdd9abbee62a3f2fedf18fb97bbd523182c55ac8eb8456b0d8b7c0904372ee92cbfeed50765d6f2d608280655b05a
diff --git a/dev-python/ptyprocess/ptyprocess-0.6.0-r1.ebuild b/dev-python/ptyprocess/ptyprocess-0.6.0-r1.ebuild
index e58d5941aebe..d03cede8cb05 100644
--- a/dev-python/ptyprocess/ptyprocess-0.6.0-r1.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.6.0-r1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-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 ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index 129af12ef930..3d5dcfc16453 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,3 +1,3 @@
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
-EBUILD pyaes-1.6.1-r2.ebuild 751 BLAKE2B ec51320b30099eb2e262dbaa84c5e9c548b72c852d804f0f6e9fe2834205bd7f80fa94f96d3920020f98157aa906e114e8ce7664e087be849e7ebefb644d6bb0 SHA512 3892ef17f16ca33aaaf872614e829fc96c6f8dee96a8521950c8b9e09057da221b0a43aa004fc59ac5715615404fc8b09e6e50de69b3029da3cc2b9893fa7bee
+EBUILD pyaes-1.6.1-r2.ebuild 768 BLAKE2B 3df0ecbe4c2266c034cc4bca1badc17c78bc53b7da0969c1a04e738c6383fda70814565dcee01bc7790d0f4574327cd0303226a202c5a938c6bec167e87ca7b3 SHA512 bed1d81a412af7969accb09ece981820f57b7db57939ac6416e38a7e17e397752344dfb9bfea0df6f64b7dd4b044bbe77716f1752d9bc8f5b029c2c4379ab66a
 MISC metadata.xml 438 BLAKE2B a9ef6e6bcd23ddb73d9a005c520caefb142d8351905f31875100ccc005a77738038aba97a4ca5eec19ca2986a9c52820e40be958053952bbfff174e01f57d846 SHA512 0d1bf03984e248499483ef6248f11baae42b253f231eeaca17077129fe9ca38af69e2d53c7b438c63217d9f5f1ca1f58a18fb1b15c7d161ebc94917fc90e8a5d
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
index fb6cd9538fa0..1d2c31713f05 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index b7dc76afac88..5c0cfea2679a 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,3 +1,3 @@
 DIST pyasn1-modules-0.2.8.tar.gz 242864 BLAKE2B 22b6cc27d45d19d8e7f5b12c8aeff1fa379bd567fda6b1dc0fafd00c0f4367d32f21cd48cf3cba140f2f11ba7d258140e8014c8420300451ab1acff475d28da7 SHA512 fdfcaa065deffdd732deaa1fa30dec2fc4a90ffe15bd12de40636ce0212f447611096d2f4e652ed786b5c47544439e6a93721fabe121f3320f13965692a1ca5b
-EBUILD pyasn1-modules-0.2.8-r1.ebuild 774 BLAKE2B 91ee53f457ad7028f65e3ca850eb2fa7c745666082861a6d51e917c334634658c1ce577361f73920beb3286a83034fee2f5f08f9ef110da34e0749c234b49d6d SHA512 a5530cf319442f33d008120a81e1d0c69eac5dd10f64a69ebf746abcc02d8a242251990c8ea9a2d8b662824658683395ae696becd95cd610a62bd449c52983ca
+EBUILD pyasn1-modules-0.2.8-r1.ebuild 785 BLAKE2B 3ced9b4bd477af78e06b7f0c22869cdcb9cd79525d80702b4050ca4a647b7eee699ab6af258022d106270496a93827577b66e688d578c7d39999da750e6251c3 SHA512 233cd20f34bd2c89e78eac966e6ecd6ebd1f0c07ce121e3686c458500d5f0ca7e1d040a9145f620f5faee88e58c860b5031a6925365d1759979e9141c3a9aa48
 MISC metadata.xml 405 BLAKE2B add7a93411177af899c2635b8222655804111e50ebbd82de341a19478a2ebbf8087efa7e473732d131af3db70fefc0d8d495eeb98cb927961156d65c0b8ff06d SHA512 fd42b04e0186119d96caeb401efb0d8810c837bf50a349d1a0ad9a38323c4b42226a5e9202ed4530823343c877895214e6eb92f9760c7599b2a6843a79261246
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
index 6514a349a0fb..1e11ec9f6bb2 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index a777ec79819e..b8c2e5042be8 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,3 +1,3 @@
 DIST pydocstyle-5.1.1.tar.gz 70759 BLAKE2B 3cdb519d7f9459a201c9b7bc3002e69dae76b79758b155198b3101c6817c66db01616723e789dd8105d0339d6163fec02ab50db2370b13d3a8d1c5a17ecded6c SHA512 70c7408dfa4c8e54a3abf0548a9af26a7ad7ee0bb76f3a41bf6f2297ce09c13c03ab5e066b1b15404ba6390ddfcacbc5e199d8b73ee74e3b184759d88c8b2a51
-EBUILD pydocstyle-5.1.1.ebuild 878 BLAKE2B 04d0b1ca84093a7c55c961e0b3c3bd72c3dfd0813d234971a5f1fff0d889f480f10c7706736f2ef8d5cb4df0624fbfdbd181f38e8139229c00a59647cd5c7a34 SHA512 76715c660ccb5c705da8a9c1aa166e014fb55b26eedcf5fc679e2da612952a5682ab5e3aded83045b9ef5ddc49791951492c9568e241ebd32c9fb562d3617452
+EBUILD pydocstyle-5.1.1.ebuild 889 BLAKE2B a0e5a096f030c87843b63857da282977e46fa4f8f73f6157a4715c2abf6fdf717a3cd4964b9fade5dc6fd44fe82eb02a5e907f1480f7041135501aba07665b5b SHA512 0d608ce4382ecc622e02f0e7b44b82be6441c52ba85ca9eaeb685435c07451320fc080b2020ecd7e37fbc10d49bfde783854c5b2294b1b683b2722a19fba73b3
 MISC metadata.xml 787 BLAKE2B 15d107190e09858b1c4642148e64d288ec11c96509ab438488cb1aba5ca0640a8ca779c585221d6bfb066c5983f6f243c2c74fc099dbd4b09d026ec48dac662e SHA512 1d38ca977db0ecf99ce5c8a8bf6b57f897b7fd1d9b087075dcdfc5891959a6bf15baf0a8ae44202fc6a9645d08a0a0c52fa6e1e39ce08f7d6eb80f797476cd70
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
index 27587d1027c3..028d2af436da 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~ia64 ~sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 2f6da3ec82fe..80109fd86f7f 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -10,5 +10,5 @@ EBUILD pyfakefs-4.2.0.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5
 EBUILD pyfakefs-4.2.1.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
 EBUILD pyfakefs-4.3.0.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
 EBUILD pyfakefs-4.3.1.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
-EBUILD pyfakefs-4.3.2.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
+EBUILD pyfakefs-4.3.2.ebuild 709 BLAKE2B 9173aa57fe05213cb4d0542bcfddaab1408992cc44d3a7c25f4fc77f538f5c37de4513ca3db5cf73911a017a94575831a92f835058b0a1efb7c27b3c5af0e3fb SHA512 ca87513a5b5bc21446324e51de8e077f1417e7d4c3ab6e7bfac8534e01e325f6f2b96b14cc191e57fcc824c836b20b740dfa88bfb2d32e3455a64b8ebe4c9670
 MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
index a437b0e387d6..687f985da695 100644
--- a/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 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 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index c73b1c204a0c..b54feda016ca 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,3 +1,3 @@
 DIST PyHamcrest-2.0.2.gh.tar.gz 55491 BLAKE2B 749f227b8cb1180a64e24cdbf97b6f610b9871b21215a761642d19fdd43ad8e175718b12cfb0de2cdb5c6ae8c3c5271e04b7c3b489e01ac689769e24202ece56 SHA512 d6e510ca1e6533b425b424d411e23c4ee2a6bad2d635695e4e68f991fbdc57269c3a433361e431cb5dda7891278951d5de7a05f5c1c167714eecdaf74644d1c8
-EBUILD pyhamcrest-2.0.2.ebuild 752 BLAKE2B baa08ac1e1e6a8986a664784583636d0b980c4baadcf1736c351feab1cce41bc3ea36a969558fd66879e5c098a6fe02b332ad10a4e80aa22dc84839a4b9ac5e4 SHA512 64ec73bb0642eaaeccf4dd364ec766092962aed1d2e09f3e05cf98f0c0ab55768b8091767de82856ad088c2fc20814cc92b0fc7cf34d46258a931f4d96489d93
+EBUILD pyhamcrest-2.0.2.ebuild 763 BLAKE2B 2023ac6d0ba06cfa1c874a64d86051c4284e250640a5492afa492ea40e6f2692592974f3ee2d732a0f05cf857d0f62286d4e7873c8c8254b4dc4e3440a0c2f80 SHA512 094edac925b45b89d242f40be64b0245e6deca7c940a8211ee7aa31cbdaf58d8d619b726fcc5c4949bd8343dc7b1677cae1b74a2d6d16d4b5e55e12c0f47a0ff
 MISC metadata.xml 396 BLAKE2B 1086960a423e348fa862f395703ef468c4e2a5a362e8fa78d15cf8c2c0e56f8bc21627688c1295dc57014cdd91644ddd81037fb0505ef1f43e2e8c93bd9774a0 SHA512 cb07fb7bf1b7af660af9ab2cbba7f87a51afd254fbb5896bed0dfa07f98dc2a6d0361e567eb9cd240291cffcabc8eb3f3427809e1ce8b95b1de36d964d8262a5
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
index 7566d36864ce..1245c973aac2 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx doc \
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index 94c2061fc35d..5f9dc98d83b9 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 1269 BLAKE2B 889d63f0de47f5f1ecdae0c11da7830708bba09a4adf57c22a3e013a82021c018426ac23e9eff319c471e2e72d6940bc68f0f97695a4f5675c17698a527773db SHA512 2a928dd023dc96790467056f990a5a3b80c7b0b8519427768c6afce27a6e874ffdb4edf677792d63853478b7ea19aa69927ed1b3823b8082deaff7f74127d731
-MISC metadata.xml 364 BLAKE2B e25838a0c27434d26117da6629070f6a3af99f5e48bd572812b2dadc979b99d551c3857bc4fa5ef23f7c9f53e16ed8bd2c5b91f1a1cd624047abd292e5fe5399 SHA512 add19bb038ff79b28e6af0aabeb1cd634214a38892533c3a5e4ca2c1ac9761e758dace11d47a276b449f9e895d74829b5532b7566c1b152e6e3b3dab625f36b9
+EBUILD pylama-7.7.1-r1.ebuild 1280 BLAKE2B fa7aa6ee027ca0351e9c0c02aca5edf080b33b6882592dffa365dba62a9a62cfa243bcca7b6a7250fa457f3d10649ac22ea9d0fa94568ca07478d1de29c0c8bc SHA512 be6282f2a56ac7ef85ee72a6ebc85b4ad3997ecb1de4d67926e421ea2f92abb4e0ee2dc9f818fff360fffb398a788d85a80e5d1a343f3677a81ea69ea66f0cc8
+MISC metadata.xml 388 BLAKE2B 9fd8abe101834b8d24d232875dec2f2e84e2d2983b7fe27243cbadb60208df63e7fbc9b450c7587df71a3ad488b104e43b43ec0e013907006e622ca5cac7da73 SHA512 96cd8e9bc7391c28d2625f02521ae93a1ae901c04c144288cfb5a7d7c0de70d2e58f73a51071b4f82f3f043c4f6c94bfef67a2e29ff7187302dedb3a421117e7
diff --git a/dev-python/pylama/metadata.xml b/dev-python/pylama/metadata.xml
index 15091e5bdcfa..5b761c7a8f6d 100644
--- a/dev-python/pylama/metadata.xml
+++ b/dev-python/pylama/metadata.xml
@@ -5,6 +5,7 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pylama</remote-id>
 		<remote-id type="github">klen/pylama</remote-id>
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index ff229030c3fc..87655172923e 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index efcc009a0e0f..40cd58de9bca 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,5 +1,7 @@
 DIST pylibacl-0.5.4_p20191217.tar.gz 40283 BLAKE2B dfe5baababe4cce24bc12dd61263c30160e93be7dc0625abdcad9e4daed19c5ac1ebf43351f9f5815884162258884cd8c7e2edb323ec9ce51247a43d53fea20e SHA512 6d4a84e1885a2000226f956580a8e767216d6280d4b8ae1066e6a1c1f82708d06a4f2eacc3ae45ff7ae3b122125da9fb6afbaae038e117b63cd7d91ac95e2624
+DIST pylibacl-0.6.0.gh.tar.gz 40231 BLAKE2B ba76f5540de62cec8572960b65f65289d7fe2066f76861240849c4c8175a9219b7ced086739b5a9b4d560a125c8fe759cc7b5b688bd4dc3d84ca4dc78897ea75 SHA512 a93ad199d9946490a863906411893a204bf801df71cf70217d6b29940a9365f05fd121116f22e054a3b8d27cd62e35c73566c1e0dd246ae5c0edd2f967df50ba
 DIST pylibacl-v0.5.3.tar.gz 32792 BLAKE2B 005785dda2b7933ff71dd1296b1d4315a6492fc893aba56136c775f78b9aa3bd8f9d4898bbe0160fac53a306329977ddaecd073739531ba42dd0b6cc622b9eef SHA512 ea648acc3df9e1cf2fd68576b0b691a353b257d00b74fc80aa7f60089b9dbc912452ebe6b84da2930cac888b9047740530dd0e38b4d5be52c37fc6d3a29a7ce2
 EBUILD pylibacl-0.5.3.ebuild 928 BLAKE2B 306b483fa1d85458b90480b771629ffd7ae18ef3dfa2a6d8084ec697e0812e13e380f1ce77cbcbf34082aab983fa0937fe71707d0f02d348dc2ea6ad4c3945e2 SHA512 496633a731bbe0c05b7350ff14ed644039a48f9c2d55e317dabd3cebc36ea08e17fa8b4e38d1acaa324ba674944b99cdd8181ccff9f30998efc84db752c9f97e
 EBUILD pylibacl-0.5.4_p20191217.ebuild 1009 BLAKE2B e2a5a73bc61d3243b26c115a7e7945260e59a9bedaddbf88affb5bdf5c8348d3db4d200afb96113f6ac05b87b825bd74f8f672d3aca0ab25e6516377cdf36cda SHA512 ea5e810818be787556024c6264572ef32a0dfa0c3013f857186586545c668cbc7bd24ee1b8430e632abf1ff06bbc8a71f6b4ab3388137472c347f9521cac7949
+EBUILD pylibacl-0.6.0.ebuild 916 BLAKE2B ceda85abf946e016856f5cb7d555c79527e132ed4fc1279c55d41a9f81101bc1c17c1e10151f7b1ae63f5773df2565acbd5d0d0888dbca3748c5d725566e3571 SHA512 b601d44f42c0f31411ed3397cc421c2d7607b6cb0f5a15810a97802f462d369ea5fcad706a5a71dfcce6b90375b11657e20bd76ef9017f0c7b87c99d3359a6b6
 MISC metadata.xml 445 BLAKE2B 01fa6d3dbb4f640a84c7cde4fc2c0c2691345fde557c7d26af9b5aaf5f64ee281a9c50eb273471ef3ec1a4c7cdfd8b48bccfdf3e50804f88981353a7a5433ce8 SHA512 b5fd28a88149cc0afb3535daa5c5e8f67f137e98c0671595a381d9d748212ed93a3226339b4999c7cfce1779fa6fa0cf568f38610ef77fed685e62dff9f9a344
diff --git a/dev-python/pylibacl/pylibacl-0.6.0.ebuild b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
new file mode 100644
index 000000000000..5b4469c6178c
--- /dev/null
+++ b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="POSIX ACLs (Access Control Lists) for Python"
+HOMEPAGE="
+	https://pylibacl.k1024.org/
+	https://pypi.org/project/pylibacl/
+	https://github.com/iustin/pylibacl/"
+SRC_URI="
+	https://github.com/iustin/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="sys-apps/acl"
+DEPEND=${RDEPEND}
+
+distutils_enable_tests pytest
+
+python_test() {
+	if ! pytest -vv; then
+		eerror
+		eerror "If you got the following errors:"
+		eerror "\"IOError: [Errno 95] Operation not supported\","
+		eerror "then you should remount the filesystem containing"
+		eerror "build directory with \"acl\" option enabled."
+		eerror
+		die "Tests fail with ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index adf23c039dfc..76e45216edd5 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,3 +1,5 @@
 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
+DIST pyOpenSSL-20.0.0.tar.gz 173786 BLAKE2B 3fb1e90e20b3e083fc93f6dc8a54fb54e15ceb38c4d2e84e2d7d68bb56f9e3828cd264e3554f25465e858687e74a7f20b91216fb7a0b4b2c656ea86423cd3442 SHA512 26e8a64d53a35434ad4bf5ef50ed5c37d7b92b0db971a2103dcafea56a0b377d67333af630a31405a97cf2cffddde320907b4950ed336a8321391854bcd2c50a
 EBUILD pyopenssl-19.1.0-r1.ebuild 1395 BLAKE2B 29ec3a4e7ca4ac8c60f6227046e80c136e12db62d493619e852cdd657a332543806e48915ee0b9613258427230e9b696d07d2295bb0ed80c837ffc5cfba91aa0 SHA512 1620336ea740370145277b48c4836d5b8d9e2c4f5d476d29c4c321194ca04adc04d1972d4278309b8dac65dd6bb8da0a1b14cb6e3689e41c3be88f8fd5a50952
+EBUILD pyopenssl-20.0.0.ebuild 1402 BLAKE2B 2ca98de775ce7d213f38ebf58ae0ade0f1afab3132b034bbaedc351436e3ca3b895e948e7238b3b0b5dfc7e0694ee2c2444ea3639868409d23ba6b3b22b4ee75 SHA512 907ca7f0a92aad565cc76483cfecd6f689162ec5cef244eae3c3e29641d08d3291b2a3046bc4b22fa9da9ec5e89ccfb9436d31282ccf0056695ac1240255f23e
 MISC metadata.xml 481 BLAKE2B e25a44e19e9e7fb701742e1c4916a41a777efcaa046b8147510fc8d9d021cbaad9fb887d8df6769b91006acdc9418df6cec4ba20a78fdec88d26b7cc4ac5c2f0 SHA512 d568654867ca274e7c67a9b30a7f50e739309a22d78c3c1f06f4216a224b00e3a05be022920614befaf96a65ac55782966c9a1fd0ae88c806acc559af307ca38
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild
new file mode 100644
index 000000000000..b09f1b1bdec6
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	https://www.pyopenssl.org/
+	https://pypi.org/project/pyOpenSSL/
+	https://github.com/pyca/pyopenssl/
+"
+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="~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="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc \
+	dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# Requires network access
+	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	TZ=UTC pytest -vv || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
+}
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index b5c23818384d..0252e0158674 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,3 +1,3 @@
 DIST pypiserver-1.4.2.tar.gz 511019 BLAKE2B fe9a41c35d601ee20f2cfe0773ce341b8c8fe387a2b825d1e6d669d5f358846b436158beb8a1222fa33cf1841cad5aceacc0f5063f899445ad15ca9eb5b8efd7 SHA512 8597a6a7e83cb3f5ead3418ee91167e1764c123b244c05397fa892c8ebe84b58569f27ce85cd9849d6a41d20342de21cf9cc46e00b233d9d94d0540470e1c49b
-EBUILD pypiserver-1.4.2.ebuild 1217 BLAKE2B 82709cfe793d656ac79e96bc04ee307a2599169dbb4bdb834d2f806d9644646f247639b251b4eb6a3bbb1d8fc4b7d055d2c1207c6d4adc2974aa678310255543 SHA512 17b339a073f45b18e8b21830684222de20b5d89d78d11f55dfdf630b0c71f6d1c1dfa4166470f4b305c19dadf24414c7f768466ca35d721245e6d0bc768d25f4
+EBUILD pypiserver-1.4.2.ebuild 1228 BLAKE2B dd05aef786b52d0aaba07688c8e059291914e24ef012aae511a75c866fd5a640297bc9b90746c8086e00762f083c4a52f186ae1d7557854b89855d133e347550 SHA512 5648e3a6ded9d919a919f6f57172bcf25f4e189d61490e28e1cd4a569fd6c2c90d37102dbf07204815ef9a5e3ba3a099e646197765769dfd2e92d56296308d64
 MISC metadata.xml 408 BLAKE2B 84e0589c8c4d813b4542e5d3080ad855611c320c9d5950a08c232c9fa344bca969fa4b23cf6d2b427731d2d30c2f678d33605207042779ea40123c6b249017ed SHA512 de1340d8f01941355ec01b2f92b4e89ad798dd9438e858050861dfb8c139994b5e8fe620b00fcc8133204ba8d265eac36f60ba3bca3a4e0da49332da13b75a9f
diff --git a/dev-python/pypiserver/pypiserver-1.4.2.ebuild b/dev-python/pypiserver/pypiserver-1.4.2.ebuild
index 13964332829d..95fda2d1381d 100644
--- a/dev-python/pypiserver/pypiserver-1.4.2.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB 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 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pypowervm/Manifest b/dev-python/pypowervm/Manifest
index 3f1d584fb8e1..b633af58a740 100644
--- a/dev-python/pypowervm/Manifest
+++ b/dev-python/pypowervm/Manifest
@@ -1,5 +1,3 @@
-DIST pypowervm-1.1.20.tar.gz 906153 BLAKE2B 868571636f3c21b5d179ba587f7693dcf8e55661324d3ba5578be34813a67a5b2881441c3aa3744a9fc1c6ea34626085d62c5829368c43b329edb98804d9fb9c SHA512 1ceaf00f830caef918c27b342f1bf59a41e88593eb36f6c5f01c7a0ef786a69b15d271c87d161f069e12c1224ebb4f6cdf349e31a551bd26fac5206860ba9019
 DIST pypowervm-1.1.24.tar.gz 906444 BLAKE2B c8ed0b066963adcc36b19d919683027fba563da8486aa1775c3f82f8ef3466ae7d909eea3eedd807585bc29fe212f65b061201f8dd5cd81d6055a89cf97b6932 SHA512 b2d254555c7501961bd45ac7a7bfea886ac12c8eab07b6bc34352e425f6e9c9cb6fa8331796164962f1f60afcaa9aa9e8a711cdf71dcb70cce7c4188c4217543
-EBUILD pypowervm-1.1.20.ebuild 1080 BLAKE2B 1ea490e8dc10ee20abb5ba222e45d4dd981603b4014940692cc220d4ea8b49eb07febae56a4ad63a047f01982aed4cd301fea5f3a5c9f15afd5743c1dea6fafe SHA512 272254fab3f8bc11564652e579338dcddc1ae2cf5b798a1ddde47b84127a9fe29708bee7dbdb481008341df67607b2c8b1d2560f880d2c71fcf40a5840709d51
-EBUILD pypowervm-1.1.24.ebuild 1045 BLAKE2B c3d9f099476e1807a0a56e6f59d73968f9511d0941979cb2f78b7e0cffd5a151bd9a3fe0d04a00aae99d1a80db897b91a374e38be3fbfcf1417680b22d8873be SHA512 a9d7af949ed2c8f22eb149e02b92b94415d5d75795c7c3f40954260250766c7cd6ff23d4dc9b40dbe52c923cbe0b335d7f45931bd735f1b74199a3061642019b
+EBUILD pypowervm-1.1.24.ebuild 1043 BLAKE2B 60026b7b31983c5a3b3bb8bdf689ddee59254a4bb9fadfe51845bda2f0cdedcf0ce3459b712c5730bbc1b240343179e87c4f04d241f9f348e356582683d9d958 SHA512 a35f824537384d5e4b362151c82c5f7694e3ac7236ca000bca63f1fd716c0021a842b31207cd103d7ba3a6b4790240ea8134d5c5fe7c0187da939d9b95754650
 MISC metadata.xml 407 BLAKE2B 087fc989e2ca985bce7fc668dcca8f7bd5b340d8f52a3f0e318c177378326cbb0069d87fcb20d38f97cb6bbb3fae8fa65f0e5e849ef2797e7d32740cd165a73c SHA512 2314896232d1f86af4b983dd61599091134d05b3461041bbc28d55faf05ce097788f230e2ed441b422dcc1b6ade15048372f8219aac7428483350163f92b997b
diff --git a/dev-python/pypowervm/pypowervm-1.1.20.ebuild b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
deleted file mode 100644
index c903bc72a427..000000000000
--- a/dev-python/pypowervm/pypowervm-1.1.20.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=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Python binding for the PowerVM REST API"
-HOMEPAGE="https://pypi.org/project/pypowervm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${DEPEND}
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pypowervm/pypowervm-1.1.24.ebuild b/dev-python/pypowervm/pypowervm-1.1.24.ebuild
index f68bb14f0618..703314215670 100644
--- a/dev-python/pypowervm/pypowervm-1.1.24.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 0c490eee25d6..d7b86ac3cf87 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,5 +1,5 @@
 DIST pyproject2setuppy-8.tar.gz 9501 BLAKE2B d0c168efa2742732710a7d967ce0783a942d4718ae2be75e6263bb560500527ee11260c9b7362d10cb059171475dc647c0bc97e284554f2e159f470e3eb7f569 SHA512 527e2de790fb02373150db834d1a007a63b71f87ae01fef1dd9fc86a51ac6cafeac28fa3f39a2d484e7a9f84549d0ba285894cf9201f3b2b2a47965be29913cc
 DIST pyproject2setuppy-9.tar.gz 9611 BLAKE2B 448e6ca468c2a5c1097e63316bf1a2da41dfc4a8dfa756553b56ebcbb66c43cce7dd57aeacce45491087b956a01b8ff2707fc5f60ada10a4f496c9c8f7c722c4 SHA512 bd337f392e3dfd686039714687bd8a57b7b946b486f5513bf603e322843a4d8f4c2fdca747e61090f00f3ed4a5284a2b182f064412a3c8e70f278a2be7551d93
 EBUILD pyproject2setuppy-8.ebuild 671 BLAKE2B cdf5334ea39ceb5493c7998264cf1eac9f259a78b739347b2727133344ba44c74d27fca18d2ac22f4ac76d3f057a6fae641734db4a034cb03b27dc048ec080a0 SHA512 33af5fa08bb93018d3eca50cb90db9a7ac866615e3435aca892417a0ec6c999914d2a8051dfe0c22ec216a776c162fbb48cbf49f668547afee395814ba63077d
-EBUILD pyproject2setuppy-9.ebuild 679 BLAKE2B fd62003b47ecc9a27c9b8fdb78552b1a94acb7af8b98fe766eb4d7fad4b91590b4e281de92f6feda8358e1917a676cf57ba4968683c86fe8ebb95922abf32aa4 SHA512 6fd333458c3451cc2e930169c81ab8035a1a9cab20c3971ad1ad12b1f81d7766d09c60c3cc41dc5b253f30de6ed2926a02c443ce1964e436dbf762a8b6867ca0
+EBUILD pyproject2setuppy-9.ebuild 690 BLAKE2B 55710916fcf2a51630f8b1efd3e7472c74fb538c68591963416abad65016197859cf7cde9ce909d1ce5c8195c873b1cdee0c1f37434f7a0e678504b863cab85d SHA512 4ab71913a6b556a21ab6d16493cf86e231883fa56f3ee63fa9214abfea0329406a7bfe1725e5a328505d1176fc68d128de44b35f7b1129cf69b0e076704d9508
 MISC metadata.xml 350 BLAKE2B 6308462418044a7972e38f09900037e4557be4e76a371b358a2000784e2f44f2f9ed5ce56be11ffc198003c3acbfb29a268372a33618c3453d3e01b33a83dbe0 SHA512 ca89ff54a01f7de3850201545f1964d19d4b909a9d0867178d9f39b180aa159d4f6aa5cc3483aef9358eff116d577d0c0a1c15f74d51f2253cf96e991d40e43d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
index 516b3db0af32..70458e2ac4f4 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 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 ~x64-macos"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 6064472b46e3..6796b03c103a 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -3,5 +3,5 @@ AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f
 DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
 DIST pyquery-1.4.3.tar.gz 47448 BLAKE2B 32451dfc8f8160207b4be12006ceba3098b8cb344bfa3e80ccf75f8cfca9542614ae78b9bfec773139cbbf12434201f92f8b4738e7d9e6241b3addfeb1bc8dda SHA512 cb61326e38f78763ca15de09e3a56dad776b3d4831b54eabf295db0f9af8bf04599642c73f5db3e3172b86d7b66ba2ef626c8cba2dfb458af6ac432d15ea7cba
 EBUILD pyquery-1.4.1-r1.ebuild 1166 BLAKE2B 2e7107a78b04b8140578938eb5adb80da02bfca536558dfde1a0480a44250b25a31893d160c634716a5fab06864e9a3a7ee0ab198a09b644bd21f27c79c2f5a7 SHA512 58c3304621c3c380e079defedcac926c1abe7f4f1e80aa6593115214aeb2357887ff83d052f1d2546c640a4309744e0eb771085ae264693520cac700eb2aa4e6
-EBUILD pyquery-1.4.3.ebuild 1175 BLAKE2B ffe8cdff5837535c1f9fe8f84155277320c3f96c752fb87706afed8b30aefd8718a4ae88e0c658b2baaf23ed84e506d4b3413a1f6b0b16fdae37bccd34112ba5 SHA512 090402490b9f9132f02fe4f1794957f253c06793c4ae5f7ce20caa3998c5696530fd32d1b0864639faf8dac4bdf65ea8af4af62dee3bf8b47929c2b2f9beb767
-MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
+EBUILD pyquery-1.4.3.ebuild 1186 BLAKE2B d5c8a701e7b0e30200477ad94c00abb120127f30f151124b489025b437371e58dbff2fac8b57de62300508256690f20991c87b9691d4ca4e68ccc28b56cba4f4 SHA512 e5bb4d22318eb2f85885c9932ab5d79639b6fd02dca288bca2e10c1c027ba928da9716701834dd3833db056f016d539277e45483c116e8c999411ac970d5e76b
+MISC metadata.xml 400 BLAKE2B d2e08b1b84985d34ddaa36dd90a890915203ba89a477d9ac2254f19b21070dc7fad74c1d51b8ca19ef56c6dadafac3a8b98fee11b9fe0d28c73a1b1dfe9ec109 SHA512 1045e3c9056b6724f1a3457d908e8a9bee0167f34db8aa45f269d279396b3a7ff42709ca42768f198e61fc03063add0a05791ffe631374b0e65328f28ad80ae8
diff --git a/dev-python/pyquery/metadata.xml b/dev-python/pyquery/metadata.xml
index 622094646888..1e31038ffd1c 100644
--- a/dev-python/pyquery/metadata.xml
+++ b/dev-python/pyquery/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pyquery</remote-id>
     <remote-id type="github">gawel/pyquery</remote-id>
diff --git a/dev-python/pyquery/pyquery-1.4.3.ebuild b/dev-python/pyquery/pyquery-1.4.3.ebuild
index cbc62b48fde8..8c50606b60bb 100644
--- a/dev-python/pyquery/pyquery-1.4.3.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 028faa403ff3..7c1fb895851b 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,5 +1,5 @@
 DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
 DIST pyserial-3.5.tar.gz 159125 BLAKE2B 6be1930afc6cfecad54cd7a116a0e93085d166907acb4c2fa5b7b9485ec28cfb6dc9e7ffc13ae5628c344ef0f78c15bdd828b8d51048a484548538cf14b9da20 SHA512 c8df5e50d952d5a6dcf1d9253a6ba953e9763c545a867da66c22c90dfa015aba0194f2a8f29a229d0a5f4dc8bfeeaaab8bcfda4066ed78a18b151bc05e6ae327
 EBUILD pyserial-3.4.ebuild 820 BLAKE2B 87bb59de2c81aa2939ccdeb0a29192855dd53341b1cbed4af3e08ba566d3c58e986130868eb754e9df07f316af910702c83970773c7ae46e2b9a94837510b5ee SHA512 e335e40a6e90ef7ad1ab4ebebfa67bcd3b910a8694bb3c0b330a5af488cf01ffa7a1df6caa2ce68762d802e0b4c8593ef5fa1500016e511eeb996edf088a5741
-EBUILD pyserial-3.5.ebuild 863 BLAKE2B 4d1ed1e94926ab964f5103d70ce84f534df29de041cca389e6fc653443c593debe83294500db7fff99fd72cfce4d36cfeeb53087bfd821e7cc72fd8b50e9b836 SHA512 7dddbe311025ac9e14ab481aecbaf48cb719dd84018b45a1d4a25fb38ecec8f88cf1e13450cd8d8f5e2574bb7e327b346bfb142bb5a2bcce177ec7421aa2abb3
-MISC metadata.xml 421 BLAKE2B f3c94b0b72c3df17d9c539e8b76e1f644e0b4ae1bb3d905652b568084e449bf11cab07f27e7775031eee857095671debd28bf1d2eb8c1992c6b980620b32109b SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde
+EBUILD pyserial-3.5.ebuild 874 BLAKE2B bce8ff314f34603c8c5797e307fbb4ef38e1640ebc09a932d1f12fd6158838983854d62f8af93715ba3233808ab0c8443e309e07e8b3db5f3d2af38d50a8aef9 SHA512 d2b894dfb6a6178a84f997451e0c40a8a52bf695c3d062ddddf592025b669339c5e556e8600c07146e06725ded8ef15988fb53b7c11803514280c2afc716cf33
+MISC metadata.xml 445 BLAKE2B 97ba2ebe1dfa4c6efc0225dd2f4f41638bb890fe5d81ed855d67c5b0dffeb45070a2938a1d2c32c2be4337891132a09b29d558ce541ce5951e24dd7f44ea7a0a SHA512 1b74a8d88afc2dc709c2e2b7ce18ae341761e3e76d19bafcdffdaf4169651f7f570d997435ce8321e93b692fe52e218ae4cbfa7f34bfac992ac477e4168bdd24
diff --git a/dev-python/pyserial/metadata.xml b/dev-python/pyserial/metadata.xml
index 9cabbe4e21b2..422b88fed441 100644
--- a/dev-python/pyserial/metadata.xml
+++ b/dev-python/pyserial/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pyserial</remote-id>
 		<remote-id type="sourceforge">pyserial</remote-id>
diff --git a/dev-python/pyserial/pyserial-3.5.ebuild b/dev-python/pyserial/pyserial-3.5.ebuild
index f593d12af733..075de9a06f18 100644
--- a/dev-python/pyserial/pyserial-3.5.ebuild
+++ b/dev-python/pyserial/pyserial-3.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 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 ~x64-macos"
 IUSE="examples"
 
 DOCS=( CHANGES.rst README.rst )
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index 310a430c8931..c57c3c6557e4 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.3.0-r1.ebuild 538 BLAKE2B 3af7c00b91e603a76644811b46c035a269256e4ad8b6f9df48d555fd5ef04ea9fa8b56833d236ea2ed6920e57683690ffa329e976b0d3f8ba0048758ffb503c5 SHA512 ee6b59750aa11f1cfe4c38b66de8aa6ab4adb4711bf7dba971891e27c5271c9cbbf5e12bac6bbb560504bfc50099ee11aa38cd3fe32063956d1160bc0afe09ed
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 549 BLAKE2B 2a3bf4a3a42a81dad29109ca2b866b557757d817edf64cfad137f0082424be89249a6fec8dda4392baf4c4387a8c4b943334020a2c760eb463eba8c23598a957 SHA512 7f15ed999311a849a0ad2eb4267e50b818366b6a9d1496eb1e7d96184ee4ce3d5e640f35c2e759b03bd6bf9a9b4ca69d65a919c94638c1cc4594da69d8a17c1d
 MISC metadata.xml 382 BLAKE2B 24ac18217bfebed19f5049bbaca9955da1a0eebe08b8fd3f8f870db50369ceec3e68f4fae68604a399084122a3e3ae460481f855e4a4a3c419e494103d452c56 SHA512 73da71aee91bfb48dc637ef0e4d47a4693ba602f8cb15d0056cc0a14f4bb74d11cad7edcee8a1e892eaf2c3cf1d85735c9f5745ea0ae8d5026a7776c0550cf3f
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index 6e263d324ed3..62822f9e1891 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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 ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 7f152616c36b..85de0e057c1d 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-asyncio-0.14.0.tar.gz 14796 BLAKE2B 0a110dabde491293dc10452239971809ec6a4006a2036e848aac067df1af328d0d1d5c7afae8cfc1ecf5c919c0922050e2db182065500ec614a8094d3799c0cd SHA512 d1fadff152a0c94f80a8272a0dd293bd9d9300ad9e79c69556b5901c1a8ce00545f7715e503a383e3f4f35c8090d8f9ec33d16739b85378b59b1786a50441fca
-EBUILD pytest-asyncio-0.14.0.ebuild 791 BLAKE2B dcda5cd8fd30d7b22f8bf442a31c8da63e7232d6a418bc1cb5ee5a1abe3f1dfc1dff6e9fbefa6e1c5054506a4d69af66b9affb7898ae9b07e5f88ba3f42ead1a SHA512 cdafeca0a4d0da94b5b8679836925bb84ae7cfb2f59e96f421167460e3728e4f6c621658cd7657fc4c2962c4b96a067e2bd7e9a0a1cbbb1b051252db8134e862
+EBUILD pytest-asyncio-0.14.0.ebuild 815 BLAKE2B de2902e52da4046074ebb2fa6edad56f98bf4f0ebe2b90c3c3f76523046e4739937d77d20f9a20fd8b28455bb2804651157b592bade00f7ffcf0b7c21ff09168 SHA512 3a4dd4ec877af315e478229e065b423e8878aa8bcc5967d905f016fd444e520230051d8327bbc01a054e26aa04c766a76e8e3a234fd7faf41433a057b8fe6caa
 MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
index e1f54e9e7210..edcb0634fbaa 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0"
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
index 7cd1b8de0356..b779d52cf0b1 100644
--- a/dev-python/pytest-freezegun/Manifest
+++ b/dev-python/pytest-freezegun/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-freezegun-0.4.2.gh.tar.gz 7058 BLAKE2B 1c89979d85dbdedf87a26de57d1cfe120ed52831e8d69c42b6117ac49c9eb7376bab018a23ca10b582fc583ca61a03930a86878c141b0c5bf4d807552484fe70 SHA512 2bea7746e4e6a7f2a979cbc5c6d7a2576e0e2631a4e1d5abb7f27f76d6c32b0520a277474c092c5e05ce257f2ba19091918f67e28b7a2da1d5829037c6b70c55
-EBUILD pytest-freezegun-0.4.2.ebuild 696 BLAKE2B e20d6b7dfe9759c8caa634a39fb8e963305cb9578874d70738d29827777b2bd6f8174345b95359c3faccb57de8b1891ab414a66c27f393042083d78c3ac8a3ea SHA512 15c7819769ae9dddd123a3ed44ad6ac86ed796a369c4ea1f7d3c5822f4c890179b6cbbe60c04b8085a068e4f8f10e9fa93c8c95a5f42fb2575e5caa162c20dbb
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+EBUILD pytest-freezegun-0.4.2.ebuild 707 BLAKE2B 62ab8b33538c416f5f138bd6b09f82e54ca93f5b122ada8cbe9c64b7237c527ba87372a0eb96e3bdc694e729a83a67ef6c9628b7841a7de305a8f73cc9ea49e5 SHA512 89f0a20d9df3a8cf7a5d9019b99d2977e23e267e2027681c33ceb9189bafe2b51cf6779aadbab75824ca5295ac285993552e32894839222905b2c370fa1f2426
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/pytest-freezegun/metadata.xml b/dev-python/pytest-freezegun/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/pytest-freezegun/metadata.xml
+++ b/dev-python/pytest-freezegun/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
index 62e1bbd59915..3b4c216e75af 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 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 ~x64-macos"
 
 RDEPEND="
 	dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index 4e1e57a7bdf2..35954e374590 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-httpbin-1.0.0-pypy3-hang.patch 1099 BLAKE2B 4bb8dd686aadc35aab144a6467d52e7de675bcc7d6de8f130bc5942c17fd19c0c914d9aef81af3ed0a815ce21caf40ad8e7c8f724710fe07290dcc8fb92d6a24 SHA512 b0f417e7fdf658783e9297a895f50587d7b997de5065f5322fb46644028caa7cd10cf6130c578f6dd1f8b6aefbd281342f6aa8f5477284de3d4037b799604f72
 DIST pytest-httpbin-1.0.0.gh.tar.gz 17813 BLAKE2B b7e0ad9f131e4d236161b66b1d6d8e6087285a6d52df1accb044b30bcdac6c5f3350e9dbfe1cf33ab64b6d6aac6b463de81c31fd12dd950426b6ed8ef4eaf289 SHA512 2794134cc005cb969752e0c1119459d3f1e106f679942880a6b9ff507f2ee31c8ac4146a9c01b9a920368ea516443954b1b7044f7b1c270fe251f7d36adf7661
-EBUILD pytest-httpbin-1.0.0-r1.ebuild 814 BLAKE2B 229afb26523c18f1aadec5f57f454aa40b2f8b8c267c7c21370811af5a16f08951c8c1083e93e951c3a0bafe5f5a17a5ee6d39d8e5bd521ccca2badc435d188c SHA512 37ac50f9fe3d340c35ef13743bc542029e9d7a0571629868e0eed78a67f4a49977cc8dd0648a5a51b9d8bc351888dbcda3d7660ea3eb9eb1254b6705706eb961
-MISC metadata.xml 521 BLAKE2B f3135defad3eccac1a8f9a7188de8e375a970fd3b6c665395fad1d4ed570aa4a3a90728644fe45f13af527d5c51216e04631ddec670cb6ce5f026b508eb5f58f SHA512 19e78d9a8706ad253eb0f7873f0e8bf308065d4cdcafc6d2ebed792f31f526c1d4c45bd2f7aecac338bd30c4ebda33b301b056f3075c11231b8d0d5ad4e77d2e
+EBUILD pytest-httpbin-1.0.0-r1.ebuild 825 BLAKE2B 8a2df93e2800a43188e97c64d5b011342804944dd9dcb470c6f66236e9aa3e83c56435ce9871560a7e8e65c25d93927cf2ba450876f6cef6a37c4386089ad68d SHA512 b28a5b06f01abebf985c38ed45caca1526d1c0ba3a9cf889c9248f92740d6d567dc4e5137489764e2a8aeb8b2284c5f824274eb1b288c7180767fb2d0e7b892b
+MISC metadata.xml 546 BLAKE2B 66d56799fa604da78b86048ed8f4da393024f1dc6f090695ca2de3bc3471e8af3d19a52737f7d298c8b08423f6ca36367052022a9795abe693dfdd1ad818e8df SHA512 311dc08c6c492b15163f5a9d327d129d6bd3feffcf6c467ad7c20c5d8237070f3de88e741ec92b1c6253dd9c7bba385d8da47fe0e3a1fc077f712cb636d7e0a5
diff --git a/dev-python/pytest-httpbin/metadata.xml b/dev-python/pytest-httpbin/metadata.xml
index a488ff2722a6..54655b1b54c7 100644
--- a/dev-python/pytest-httpbin/metadata.xml
+++ b/dev-python/pytest-httpbin/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pytest-httpbin</remote-id>
     <maintainer status="unknown">
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
index a47925c658e7..5a197798508b 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz -> ${
 
 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 ~x64-macos"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 8dfc2537b570..0e239618d58e 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
-EBUILD pytest-localserver-0.5.0.ebuild 682 BLAKE2B d3cf53ffd400b91edf8e5647e0a21701e173dbe1d060643dedfd207cb728f975ee96cb7699cc6490a4e7fda983cf63d0e480650b43aef81ae0953f8ad904a337 SHA512 10e898248758abd30e76d64be0caba1753b5fb1e1052d8ba1acd1d81a3bb7a69afa83102011bfe4d6aad432b468c630ab8dd60f60e6bf6b5878322f0fcc7ed3f
+EBUILD pytest-localserver-0.5.0.ebuild 693 BLAKE2B 15297be9b0bb93a6e3f06040a66b237a720229727821b59e6c610fdcd40d879320f2928166c32efcaa67d2957c98433f7d44cd640f482e1132cf0dc4a48fe73b SHA512 03cd9c94d039885f802f9a8244e39203b52ab22cf5cb072aae946b1fe8373a1e579d44287336aa03357310c88710ce14d26784033c9d01d5c5a57c8799219586
 MISC metadata.xml 345 BLAKE2B 79e94a8ee25d0f7284462fc21638c20778f60d0f8cf2e84f6904bedc165293c5f13335b3bc2976cf6bd0170fdb0be80b52b256a3abfdb9eacbaa98661a9466b8 SHA512 5a2e28bdb0a20b1a04e1f549130a7f1bf3b33fdd176baa50db33e999540474abe091bcf8ad76c4554a0e046dec7466c72f0786acaa87c88e72f6164891c3decd
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index ed46ebb84c88..2012fd697842 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.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 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 3b69d2ead7b0..21fd597c0d73 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-mock-3.3.1.tar.gz 27551 BLAKE2B 9e3602b988c0e27caa295d42d7400cbe7e3e30392511e662fa6ec16ec9fa4ef776d3e64b63b0345d1b520f753c6776103f507f91f0bad022544bfccc510b7e6b SHA512 ffd53974f82f725cf3bdbe750c1deb568ad1a12a67532eca93ff28d80b1cbcd8ebf709985f5473717c9d54345b251c1627c0567821e9e8b9e102db5c16cf7421
-EBUILD pytest-mock-3.3.1.ebuild 944 BLAKE2B 475efc91ea9f51771557b9ce15bc672087b94929fa2cfbbd989282ab5ba51cf48f8574b8a28f627291a77c19ff2f6c87598fd85ebad82fb4da8b0a19d1cd7f64 SHA512 75849d8f191d54f07f9725ce7d82bdb7ba1bf04acb908af06b01e5a6d3a91f73ac2c7174a4e2df6532f7f51deadfc0325cfe13bd9879a268fb610e21f4f0060b
+EBUILD pytest-mock-3.3.1.ebuild 955 BLAKE2B 3206260037284cdc8f2d6b7c521a58225c149e99d97475087bf39170bf26b75c69ce0f683b6e564d779f342463a7afd9f697579207688ec336399ca546e18a4d SHA512 a1648c76ad6e4e4cbcf89b221adab82d51089d0dae49358456907c5a8980bd3106cba2b7e0aec344e166334534c5732653204fa1c047ad060729a9868933ed26
 MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
diff --git a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
index 9671b4ec0572..48dd889e97f3 100644
--- a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.3.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 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 42b4f3d033e8..289f60f54446 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -2,5 +2,5 @@ AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe0
 DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
 DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b
 EBUILD pytest-xdist-1.34.0-r1.ebuild 1036 BLAKE2B f576f44fdb55876e9cf7ccaec9ce5ffeede2095111a48f2455da590cc4c053ffac094b21baad142dc9ed54c654af423b29c4f7719dd32ff49da2d2f149e666d3 SHA512 3dc96e04f982a62f24f9ab9b2748dbd1a97c486ae3feee09b2e6fbd1ae4af6910455c456537453fa48d3cb85e03ac09acd7d26512a054e3aff83b5dc28591f62
-EBUILD pytest-xdist-2.1.0.ebuild 940 BLAKE2B 99971cbc66925d5852dfba23c3495281f1221372f0e9e48332908297707ffc4214153ac422965d2be7c4ace98e747d0ff3e531031f1d0d7f05f71d625a73850b SHA512 4def0ad0cfe6f8f3d9dc38db668e502fee9f9e2cf9a14578279cc5b21bb8e0dd35c446a838543b4fafc357f39659e98d2aca5e749c3f782dd5c398523b30ecc6
+EBUILD pytest-xdist-2.1.0.ebuild 951 BLAKE2B 13e823eb0e3cf6f9127a83aae3930fddc017480118c00da6e8d55f11cb24f4ff4adf016689fe0e4e31190076f75a9aa923fa798c6a85d75a21c91522ae3037df SHA512 ba729fe545ee36876d42f9525c9274d1fdf46c4727e20ea76d09e88fb4d34ff673a546760523c9d23d4a3a585fa33e0b1d580be01c72dd02ae6be0aa7a0cbf13
 MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
index ef6d90f384cc..de9789a944b9 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-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 ~x64-macos"
 
 # please do not depend on pytest to avoid unnecessary USEDEP enforcement
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index a79d6820f5c2..7c26d087148c 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -7,5 +7,5 @@ DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a16
 EBUILD pytest-4.6.11-r1.ebuild 2473 BLAKE2B 4a5edd72d94553b553730a5caa2c17c25826a5be58bce6273d39d2a010a70c1fa1f8acb0751c3fe5185883a94da31ecd7e772f606c82d8d99b639804bd49d5d4 SHA512 da60063475df3b7e9e531b234e486bcafe7c1e926f58f7ebaa8e38cb02233629160aa20a9b665fddb83e50f52b0b46702b8a80e65195af4ff7b3e939927db9cb
 EBUILD pytest-5.4.3.ebuild 1940 BLAKE2B b17bc0f3efe70c149ee494d2528f8e16a839c4cb2965378ab6c8b37e3c1b295bab253edd8410f6f2a69cbeb288d6299898320d387330e2d7b5b31418e985a0d8 SHA512 d99fa3064053e3ac99fadce4b23749e16dc2d9e6658f3ab07b1e68c1885d9fd243f4ab4f5462e127b9afdbb957bb498c41126ce79164a31cb2accbbaa1f4b7e9
 EBUILD pytest-6.1.1.ebuild 1638 BLAKE2B c43166fa602717e4e88285aa5066bae519e881edd4aa4773d8dd9d1edccbf45b3778921b46a2e02fddf288cf3eacfa26581da70d49a3ea7e23643eda167da36f SHA512 252999b9f78a253bf152895550ed60a0c69b66a9de6309b8a98c4f5de42e04befbef39f65ee24f9d59def9a668363e4472f806eb3bbff5c2b5a3dad1c447c1ab
-EBUILD pytest-6.1.2.ebuild 1645 BLAKE2B 86f1428f01d05acc1b3c64fe989d7a35b09ce3407e08d49ff582d40c4999d768c56ee4088dc4c6c3bd0d9852ef8a83fcf0de5e7a0f7cc397ab2951b9711bc936 SHA512 e8e0006c7a66b44b96a49d850baf2ca4cdfb249ec46f65ec5b5faa1318777976d3fa25614215f38a099cd7ad1524cefac84a9a55f7bba911d8f89e1947fe4d7e
+EBUILD pytest-6.1.2.ebuild 1656 BLAKE2B f7c0cde785cb6eeaf085916a50b4448116e5b05733a771682de619253b827ea157d25e0936c576807281c196f9f1ea568b088089a7c7feadb74c7668399e087f SHA512 3baf9e0cf2a554ca9d352e7fef25a15b625483e1142755f0f5f64bf39e1eaa4d214128cbdd7f466deeb1aaa59b288a96b51d2e9b92711c50de58e7e910ffaaa7
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.1.2.ebuild b/dev-python/pytest/pytest-6.1.2.ebuild
index f101893a5c2b..c10d175798ea 100644
--- a/dev-python/pytest/pytest-6.1.2.ebuild
+++ b/dev-python/pytest/pytest-6.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 75ab995b940c..4f7404743da7 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,13 +1,11 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
 DIST python-3.6.12-docs-html.tar.bz2 6013089 BLAKE2B dc1c9f702bdd8be619c3cd6fd0f8cab022b8d7542ace7a7b7f63b9642f693c63b036f03248cf7ea0108ab7e33655379ca906c8ef7c35d8242517ead721a83778 SHA512 da28da84f5e8f889f328fafb4d17beb6cfc52c5703bcf5080cfbaea552f414d6f0a682aaacb2f04fa32e9453a1bdaae8ff108c38a4486170bd0edf1efacafdf7
 DIST python-3.7.9-docs-html.tar.bz2 6285801 BLAKE2B bc76a90bed3f9126a63fc76bc7ec858b90dcf827eb0af19652ee987aa3feeef9de71be0e14b33f98ee5733b9eeecd3d6ec01837fcbab31d505e389ea99d6fd0a SHA512 243327bdcb85b696fccf20b3cb841b398a672f07e34f441323418651ead58ab3346eff39e78501130b5d97e5d87fb72c945a9c4b9082b26577f33bd095791d55
-DIST python-3.8.5-docs-html.tar.bz2 6562020 BLAKE2B 29a375c0b0be6bedc7d52c15e038b1d150940a0b6185490bdacbce5822c6e88c49124a293a85ea2c08642fcdb99625986ec26ca1d712184988e02729f35e17aa SHA512 db9cc21223bc3b3126140e30c7731152816c61fdb647787c64e138ec882838dbc69fce8a4012ba389bc8efebdb2e0efb5e1b0a6cd652a8b9ad20bb021b277de7
 DIST python-3.8.6-docs-html.tar.bz2 6578280 BLAKE2B efdc62b2d570cbe7e69be1cf118250ee89f1b09af7e7db306970e764dcc9e6f20bda9230fe934ecc0891a1d79370294bc42170713b9471d05f23a468f09015fc SHA512 be0d61a9556fbdd24ab124cfdf220b3bdb537cc02d5896f8f4c75cb73e3cfd5c2947c060d049b57bf5576b4b2d1c7f0f3987070d70ce883dea023e1feab1a630
 DIST python-3.9.0-docs-html.tar.bz2 6771373 BLAKE2B 301b8687043277a3d11dc497985769efdeaf33f8af2fc3d52b8a0b50322851402c1a1b273e782db6bd7ac51bbd94f7345c0995d0dd4f4d37bce10351620c6f6e SHA512 d04957f4895ab8f6bef8467d8b5282e0b3e5c453e2168c25123ee7aefd7a3d6d8b918e9f455bbf82913370a00181b8c00998ec2ae67c763aeda237c5b3a42097
 EBUILD python-docs-2.7.18.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
 EBUILD python-docs-3.6.12.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
 EBUILD python-docs-3.7.9.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
-EBUILD python-docs-3.8.5.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
-EBUILD python-docs-3.8.6.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
+EBUILD python-docs-3.8.6.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
 EBUILD python-docs-3.9.0.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-3.8.5.ebuild b/dev-python/python-docs/python-docs-3.8.5.ebuild
deleted file mode 100644
index 2804f868635a..000000000000
--- a/dev-python/python-docs/python-docs-3.8.5.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
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.8.6.ebuild b/dev-python/python-docs/python-docs-3.8.6.ebuild
index 16f1d2327d67..2804f868635a 100644
--- a/dev-python/python-docs/python-docs-3.8.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.6.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index 70f8c5b6f6bf..bee1e85d5d95 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,3 +1,3 @@
 DIST python-mpd-1.1.0.tar.gz 61104 BLAKE2B 274a829a3fc1404a4e3beb4df3eb563c1f781325590702761d3b3b5bc42e3cd9f63809aab14bb98e4879c10ccd55bb9d7306485ec22d37538cc2e36006a3039a SHA512 65b17ae34b2c731b7d45801211e49eacfc18239d5575075be0c11ace350da19b82dd151fefc42077454a988d3deb1b489471f739ddea2d915cb3c241669dbe32
-EBUILD python-mpd-1.1.0-r1.ebuild 1019 BLAKE2B 60dc2ced1267252b5fbe347ec4db9b51ff53f78f3d70055cab25589d61e2e26bf9ea4c5a4ed8c24b684a835795c347e9e0a9f26f404f68de9c7c692441f8edb3 SHA512 3d5bf38f0d6e2d6d31a43eb6fb35e2f603832ba99a7347e5946cd88b22db7ac5a72a3d0bc0f14137bdec5502f702c6c92bc06cdb9d53ffe34809edb4ca63b713
+EBUILD python-mpd-1.1.0-r1.ebuild 1018 BLAKE2B 92786bd5bd913e7c56103cd1dee823dd8404402c572dd79ff7f4e333981482397b3175b7c686bc3e577e445f38701f13c8cbfe96eb9c685982e8fc1cade6ac62 SHA512 bb3c028c4e605ffa8f82139b301a777832f0eed4d90742223987d148f6cb2ca8d9c56d73acd5a0a3027d14f4e6f6f49a1a66a5b969baef965e7c756922ead9de
 MISC metadata.xml 462 BLAKE2B 7ab5f8dbe5062af562e466d8c9452e29072c1d91ac10eb7adf05f81f9c7ab7cb28a2a81f6a80791c782aeac33a863ab26a17e88c0bde408db084b29fb8fdc592 SHA512 2c3220c6a6efe353ff1d667b8689f673c66ee58176a140437237cd74fe02c794bcdc219dd658f8e77d5f338a6c877890d09d28d87580cef36946011aaffa4cac
diff --git a/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild b/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
index 104c02850d60..8b6bb781d6de 100644
--- a/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
+++ b/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/Mic92/python-mpd2"
 SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 SLOT="0"
 IUSE="examples +twisted"
 
diff --git a/dev-python/re-assert/Manifest b/dev-python/re-assert/Manifest
index 33cd67f361a2..0df7812126ca 100644
--- a/dev-python/re-assert/Manifest
+++ b/dev-python/re-assert/Manifest
@@ -1,3 +1,3 @@
 DIST re-assert-1.1.0.gh.tar.gz 5010 BLAKE2B fc65f43b3525d02d877d51f0a1556b6b205dd1126fc205b775f5c0b6c34ee7c3e8d224fc3f46a80e8df4a366674be90221e891e19e12072c87ff82451ca8676c SHA512 fc14267cc68a12ff7350982f0bf54c77107809c9f0379ab3aa73fa1b7cf5ccabb130fcd35ab75bdf183e69c802a041deac707e1f0bab1c3815d4146b4e320c07
-EBUILD re-assert-1.1.0.ebuild 524 BLAKE2B 027a12ada8fbdc04289260974bad4e9e159e1933dd9fd379bc3f929c7b26c43dfdc558e9379ed457d9582d7b6afce5a20948703b47d2d5e55b637654ee555db6 SHA512 2e05b8c1331a8429de9c5c6c12ba0b1888c7a0db497c01c61a58406dd0e13768e09a35ad96fd33030fa37431a2bdcd29a7bbe68a06d08d748daa4828047aef3e
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+EBUILD re-assert-1.1.0.ebuild 541 BLAKE2B 535965a967f7b4ba34fc25ebc4886dc5e59371fbf56be551f29249c4ba707740e04f739d33bd1fc163f1ba3591252a7b8392a5f69d34932ad66002ee7f06b02c SHA512 ee4238cdb14dd6a0211c3f354d55f23eefb3904c8e5771ab046de3afbd21fd44fbf34ae8037c6edf80eb2b784bef2cd68ea922987cecb578576d29df19b24dfb
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/re-assert/metadata.xml b/dev-python/re-assert/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/re-assert/metadata.xml
+++ b/dev-python/re-assert/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/re-assert/re-assert-1.1.0.ebuild b/dev-python/re-assert/re-assert-1.1.0.ebuild
index 0e701ccf39a0..b608989851e8 100644
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index a948369bc2e4..fc7a94fdfe7f 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1,3 @@
 DIST readme_renderer-28.0.tar.gz 27370 BLAKE2B 380e10941fbfdc17193a558b0a90b919b841153aa1ef4f26634202c5d500b57755858354374f785f0dedc5b119365281e50897bc9ec95943c8b08d69976e692d SHA512 2a5a00e404d2cc156e01433232fade64e13d2f95177b72c1d3903554144746317efc637c17c6333c501cd426f77628bf45300e9b219e30e26fa3963da690e06a
-EBUILD readme_renderer-28.0.ebuild 821 BLAKE2B d294e667e169c32caca0c31e48344599821342fc2b20a8407d26dfc0d7d1283cf2bf4375db2b33ee41195793f8a93dc9ea6465b400e1947ff35854c7ed92caf0 SHA512 13e27d6e13cb712f60bb6e29ed3f98332e4d7c90c52866a75bbc183e9696b0eac154cb2a574b9cb02ae901049065bcc2dd4d7263e0abeb5f680660ab6af1cb37
+EBUILD readme_renderer-28.0.ebuild 832 BLAKE2B 3158db65fe150dd442daf1f669789b0f505b6b4ec234a48878dfed2586b9a3d152303ff1bbce97b8212ce149a39853eb44455559b6ff498bd325485d4f6c4c4f SHA512 cddbab425ad7ff88511b264344e99871f96f1084cd78cb71d9b8564c7267329accd7f5cb78856d4b6b03c92717faf73b74e2597921a594202dc2c15a35f824fa
 MISC metadata.xml 415 BLAKE2B e5cc550becf1313c5ffe212ee846529669e2f321c9e2a1cf66ccd5b93f2c94d71a9506300223fdec685b406c2eb9aa216fc4bcbc5335560062158466b3e465cf SHA512 5e2c1323f0f5005984e3b8ec5cfb978552a45b343fc79f39534206e8ef7c08656c5797df42e3e1522ec27c6dbf3f91432fc68082abcdc07625c25b6e8c67d69d
diff --git a/dev-python/readme_renderer/readme_renderer-28.0.ebuild b/dev-python/readme_renderer/readme_renderer-28.0.ebuild
index d00ef01646e9..34d6b260641a 100644
--- a/dev-python/readme_renderer/readme_renderer-28.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-28.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 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/reedsolomon/Manifest b/dev-python/reedsolomon/Manifest
new file mode 100644
index 000000000000..8a7ab3af7a3b
--- /dev/null
+++ b/dev-python/reedsolomon/Manifest
@@ -0,0 +1,3 @@
+DIST reedsolomon-1.5.4.tar.gz 283778 BLAKE2B 5354b8d320db1533469ae1fd706c0412a81bb408675041af5dbf42b42014e4b779b937fa8e3b3d0a5e67e62d9fd7ce9ac519022dd98dbc82a156ee0cda7914ce SHA512 c738f817c8f536ee86e5bcd3de73a4cf6a3e606ba196a359b6c09e7372dba31316ddb8b134d7c335100e4c2ff0158ff07caa35fee9bc20768bde23cd803e274a
+EBUILD reedsolomon-1.5.4.ebuild 670 BLAKE2B 82c981c08f59f999588baf804934f82190569dfaad641e705ea7e62f21bf8a171c9e3a176b48f31bebd0f0f94b338e2b356d17b950b4a7c39e8e7e749b8a154a SHA512 69c882d797293e2f0e701444474c01c94328624091a2397213b6a3f52258e40af43bed2b2ea2f7a7f22a4c4de91b8930a42250a1b8c9476a05cd70355b25ca69
+MISC metadata.xml 455 BLAKE2B 255105206c0c23c7db350779418c5851c3bb4c943efce7ba6fb7e15cc0f62fba378ad821f65c8b5d6d5abf54c58e640f59437cc1bd121df951beba2bf8b24dea SHA512 eb3c365cdd302a46b963fa74d3c4b3bea7e9b55fa3a06c5da975e652aa1a721f6bdd92cb236f3a5629a8b0f018007eeefec06a28762dbe5ffda53f525d050ef7
diff --git a/dev-python/reedsolomon/metadata.xml b/dev-python/reedsolomon/metadata.xml
new file mode 100644
index 000000000000..f4f98f9eb8c3
--- /dev/null
+++ b/dev-python/reedsolomon/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tomerfiliba/reedsolomon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild b/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
new file mode 100644
index 000000000000..e3c9f2928bd9
--- /dev/null
+++ b/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python Reed Solomon encoder/decoder"
+HOMEPAGE="https://github.com/tomerfiliba/reedsolomon https://pypi.org/project/reedsolo/"
+SRC_URI="https://github.com/tomerfiliba/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+python_test() {
+	${EPYTHON} tests/test_creedsolo.py || die "creedsolo test failed with ${EPYTHON}"
+	${EPYTHON} tests/test_reedsolo.py || die "reedsolo test failed with ${EPYTHON}"
+}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 6a54593115bd..d55506980752 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,4 +1,4 @@
 AUX regex-2019.11.1-pypy.patch 10520 BLAKE2B 7ba3b494c1562475ab3e5b996083bd75e2273104dd0e16d44a4162b5c6e994aa6ea109a05b1e338b0fc9e39be28edf193ca52d2642ac6bd57549d9dfde0825cc SHA512 145c7b530c807dc4a331a7c48a90a56418be1ab1cdd3072c554607f579836acf3199c8ff6dd56f74ef221dd24bf7ae390bde932f5d4a00761ce2e23dc2af1f4e
 DIST regex-2020.4.4.tar.gz 695848 BLAKE2B 0dc41e1f1464014bcdc10b7209f7ac0506aeb6a3e09c16b4ca302619aaa8271cb06138627e8ed7f64ff80cf661eb83f07b4514828cf7fa94f21211fc42ae9f7c SHA512 95eadaaffaf87a19b31024ad3cff670d34a31de8b9be430fc276a533a584203842d1634b66a346c4aaecf2407b973bb1ae9c8ee8b48785d03bd5e45a67a271a9
-EBUILD regex-2020.4.4-r1.ebuild 885 BLAKE2B 191d2cc797a72270f993a6bc93b4e0ef077ca2b9bafecb4366931d855f8da683747b65e96d3744a347479497449794cff2f41430221e09dcf174ddc8baa8a79e SHA512 5c28b91516205dbf2e76cbfc7c026122cdc2c615e595746d9dbe1c48263540ff1edb25e1bddcfbdc39cff232663e4cf8acf835284e5a2855f0e86c98fa222008
+EBUILD regex-2020.4.4-r1.ebuild 896 BLAKE2B b555ea1993f38412263fe0be1f58c05396357f3e2cccb751cb05b0c0de8495a26d025eac37b52762648e2edb39123734b832a77c40a3888e15f86f8dcacf6993 SHA512 18a076478b340ee57ac3d5634b8d43ce64fa1461be1530192cddc562caf356dcddb5eca7531fefdd41f2165a64964bbbdae81bb72d5f3cb426d69631eced3d9f
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2020.4.4-r1.ebuild b/dev-python/regex/regex-2020.4.4-r1.ebuild
index 7c9ea45b80ac..2aa93cbb4e51 100644
--- a/dev-python/regex/regex-2020.4.4-r1.ebuild
+++ b/dev-python/regex/regex-2020.4.4-r1.ebuild
@@ -13,7 +13,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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 9f159082942d..85b629cf0ab9 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -3,5 +3,5 @@ AUX requests-toolbelt-0.9.1-tests-internet.patch 1225 BLAKE2B 54af195690d8ac4754
 AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c485ada404f405413117e7451d36eefbc4f05b0073f86310e66ad4320e8ce648175aa072306acab551a50a4a516470b0beb4b981124a SHA512 540813a2d69c84d37a4a6ec5b98d2b71693ba34bbf661bb44be69c646d164134702e9fadd341d07085205b476239260167c858983978488553a07bdbf205ba24
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.9.1.ebuild 1130 BLAKE2B dd8d47b87931b1606181f2f79115f07f72721e4d3b9027bcfbe754b4c3db5fac4810e5508d02d3f2fe3b4d8229b903eab165e10533a79ac274ebd8ae144f71af SHA512 3eb41cce66f59c81b069110a26b58b07d92274dc7ede46f2c5740dceb337c0d9b7bc5c08c4387d25524969bcf6f9828a1cfac005b1096a7757dab966a46dfa8c
-MISC metadata.xml 398 BLAKE2B fcde3c429bad373cc0b0f1c155b217a69aac285add9c7ad92b50d211e36ccbed9e8d6c8b4d3cf42ce3250e614085bdc241893a6f2354dfc8b7e6a60a8924f58b SHA512 57e6affb2231a071faaa01d60bc44832eafe1ae5b927383666b230492fbfcbeb27e5ccd9d06308041aaaa1626289b5e1328fa1ba1be6d845564dac56b4fe3321
+EBUILD requests-toolbelt-0.9.1.ebuild 1141 BLAKE2B 658ae3320cd659ee95bc9c47cadcfa82d67216b58244b14747cf6528d8ab2a11b8d694d5423a644c0d308d67288aee8cdc78654c7d92056ac1e095ab399eba74 SHA512 c1b449c475053f0ff2ef34f85bd0bf7b1966eca32d169929803184b9cd2a4af22ab35a0de8651e324190c5958658ee3e0c4e587e9110c2d73e737bf05af7c998
+MISC metadata.xml 422 BLAKE2B ee5e05cef3889e6bfc8e252aaf7bf6752ad4d094438684ae545ab5e20d119f64e0eb7c26de9f7cd5ac8c649b50963c8ee2002d22eb8dd86527ec94b93870422e SHA512 aef79a2dffbcf613f549e48b8d47ae013e5880e5f507b3677d37997c167ad01d8d6bf2671b04209ba2a7179765a883490e8ec1168e7e01a0dcf4f4695663058e
diff --git a/dev-python/requests-toolbelt/metadata.xml b/dev-python/requests-toolbelt/metadata.xml
index 77f35fd2daf3..5965c53ff5d0 100644
--- a/dev-python/requests-toolbelt/metadata.xml
+++ b/dev-python/requests-toolbelt/metadata.xml
@@ -8,6 +8,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">requests-toolbelt</remote-id>
 	</upstream>
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index 7a5a93fd5717..4db1fc89b097 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.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 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 731cd3ac0935..2d4d86a70292 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +1,5 @@
 DIST requests-2.24.0.tar.gz 115071 BLAKE2B ae98be1d023b2a7b883e15a7a5d214ecbf482234e9de6bfc9cd06d1f04d1b57d101d41a2c6fdd07b7a6b468875463514841d2e023391ac8ae0797a2cb58b3424 SHA512 46ca8ab70eb39be8398c242404b9b3ffb6baddd5c78eaad125b55c719154eb8c7b6a737a8dc587b0cb51b3b9a074abaa8b2ff347a64d38f4f90cdba4db16a119
 DIST requests-2.25.0.tar.gz 101897 BLAKE2B 5de8f4f5059915f929ebb71d8209bfefbe95bb381544ed0b6875cc01cb958e6fe8861cd8321143463da5dd872ad4ff8c828008bcd6409b41857c4d2037db3f67 SHA512 dd13ccb6bcd95bdd31a414dba67e5a0914ff172ae6f5d255849837e8e2a7e404e3c02fc3d07e5ff6dc81c12d0fe56c3b83bc62bc377dd3f504b00b97b144db74
 EBUILD requests-2.24.0-r1.ebuild 1500 BLAKE2B 8c41580af3392d4b1d22aa3809ce970e7c6ef9f56dabab7daf1b02892e8cf116a0c5872625b1de7816201dc5650d3db2907e8514c25eb6d46799f182321350bf SHA512 1eef7754e3491548ea66ab9a7d34b6412e9c08cae2bfee0eec4ab914445f6bf32ecf07ae52b3c56f31428eeebb67ffe67702d9e3a2d25248b4853a26b2e10fad
-EBUILD requests-2.25.0.ebuild 1509 BLAKE2B f7802b5efc776749a1c860df4ab768c8743b8ada425b0998fbf5f4810608e3ec3a842e16cf95c9709a1a19c2dc95efce7b7d9ae302bf746be11abaddea18e6a2 SHA512 b1e518bb49866b86097df22799c5b6ff5cdc9e1b26583e54a1a44d6f85d6eaadc9ef946e9366e92350e168d9246b0f317a2c517345258a3b213a2e3cf47ad968
+EBUILD requests-2.25.0.ebuild 1520 BLAKE2B 6f3bdac3f957e720f441bf1f3f72947930d484b7e42ee60dba208b0bdba0fad9585d04106e0450b270e34c299dfdd4c1fcbccd084b060d3696b187e5fe6f3ddd SHA512 17c356f6f4906929c2a011f29f8eb140c790729a885b34f84e6d7cc5b39604272d4fa3a54bf9d34918029e7c344269e9bcdf331a6ac2b26bf7f0869d3f4d42c4
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.25.0.ebuild b/dev-python/requests/requests-2.25.0.ebuild
index d885e1466c02..b644363d841e 100644
--- a/dev-python/requests/requests-2.25.0.ebuild
+++ b/dev-python/requests/requests-2.25.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P: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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="socks5 +ssl"
 
 RDEPEND="
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index fbde255a6d9b..0e4ab449ce9f 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986-1.4.0.tar.gz 44912 BLAKE2B 595a644f8f92823ad31113ce88218cb30d16b37ec7303c0d8e89d2d2b1e18448d99003e95d61dcf09cb64aae517037bae798d1e89c74b652d517a648e80856e8 SHA512 dbcddc09331b794eafed8c2d7b81b7b632ba5cae2741e33ad12e781bc923427a05febd2f2715d037f35769b18c8d790546dfd4bbebe6e71d35777745e446888b
-EBUILD rfc3986-1.4.0.ebuild 664 BLAKE2B abb58bc5c28ee5d4ad9e37d77c7b568e3e67ffead849cb04d974995798876a403bcb547890377f210b698e81fde62ec323c38df35ef797a9025fd8751550891b SHA512 cd911d46b16f6f5748ecb7cdc2a2ca9ec47142431f1aea957c4dfcd6436554cef924d2f471fd82c23792c0970f4af98ef3a29181ca2ef81fc1cddc5d3eed8264
+EBUILD rfc3986-1.4.0.ebuild 675 BLAKE2B 2924f37d2ece104e816d7ff96915b21c5461f0280bb13f89adca9d0c216fdbff5cff2213acb5678e8193a7cc22e27b01694043ef9eae6cfe5dd99511e9a8799a SHA512 a8f59e3cec1ff3f8afc36a69df093445bdbe5c47323aed3b00a6e6e47f3a16257bfdb934415dd55f3abb3d9351d82c681643e976026331a38ed6fb3e87e301bf
 MISC metadata.xml 740 BLAKE2B ad52fb6e822fe4ab8e910af9f4896079209f0704c649d240464eb283c9796f5bead9303b7bb02f5db5049b9afa430bd190871c1bc391a21647eceb0d353c02c0 SHA512 3b74fb8b21300169b3d9da6c8a14bcd950d277c56ea242a73fc56637d853cba64de931567b19c0cd8b9acd6f7b8e486fb9e1ce0716b1c291669e6588caf6611c
diff --git a/dev-python/rfc3986/rfc3986-1.4.0.ebuild b/dev-python/rfc3986/rfc3986-1.4.0.ebuild
index c7ee2f6a9745..9d09a25da402 100644
--- a/dev-python/rfc3986/rfc3986-1.4.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.4.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 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="idna"
 
 RDEPEND="
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index 8fefe7f9557e..7941f0052771 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,3 +1,3 @@
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
-EBUILD scripttest-1.3.0-r1.ebuild 548 BLAKE2B 068222394d7df386b747dce8874fe4b1928d6f7a08021726edf293192622bc4e5fa550745295adba71ed23625f0f3dde2430fa9eea06843e890a1867a64d624a SHA512 e0acbeebebd9b3f4d42b294c26a64ef00b5eb711caaaa611af739934645538bc846259752ef86ba143c8b6bfd40e9cedfdb96421745b0e71513c8c50c7386026
+EBUILD scripttest-1.3.0-r1.ebuild 559 BLAKE2B c944bc1e38e345d27e57ba915b62ef64a53e48d313b12e6db9278f45d7528e6b76933d97f8783a11fcb50eb8b7b33aa23baebc4d09cd92938bf2753134390307 SHA512 1b6d1250052490f132a11efcc75a87b72aaa7d56adbbec32eefc0f6ad449953961fef29525a5cf2d37d9104f964fc4e60f3c94944e15cdd9e859657cb0cb68e8
 MISC metadata.xml 313 BLAKE2B 70bc88a2b745b46e0da17a41ef420dd6b0ae2fcb3f444ed6be3d6bcdea63a4b0019790e0dba51b46c3a5d82c93f667f25b116793623604edad4d01841af723f5 SHA512 ae1c2257d3367ea3bdba8e040c0efd98674fe833f7a025c1b554e8cae6e1a41de6867e63c3d792593fa2f4baab158b046d2efaa08d6c8376f8ec749cdc7d4ff9
diff --git a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
index 78cc074b2dfc..6f5a87847e1d 100644
--- a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 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 ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 42f15fc862d6..935f3dde55eb 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,3 +1,3 @@
 DIST scrypt-0.8.16.tar.gz 54205 BLAKE2B ce4f86f8bacb4f12408604822a32c9f63f96a155469cca1d2aa50cf67fc9e9576432f13ef49694a9d7ce21696aedcef27419fc0d3aad67a87d16c3bf8c0f94c4 SHA512 9498637d1354a84021f2c069a919ff157ff189d1385453397a9c43e522de77af9d628a90d649d50e9243abfc0b96efe4e38b615322d83133137bad94d448ef06
-EBUILD scrypt-0.8.16.ebuild 594 BLAKE2B d01247d9c618e2083b9dde83215f2ea588b3b1c03438f5f59c5472e0e1e3d62433edf1c632dcd1b252f36561ec309a9cb1aa736216c8ab79c053e8ef8b12f17e SHA512 8e1379e65f1ecea2f62dd142d7cfb28a3b3ae075387173ef8e2ce8148eabbd78d207c349fe05d9ebec77546eb2173862652e524a70eb052ab8457bafdaf24198
+EBUILD scrypt-0.8.16.ebuild 605 BLAKE2B c77704b86eb0828c4b5be143cf9834de6730f6c6baa01fc9f3be6bcc0ed3dcecce1e3f85d2f0239f02eda2ee58a7178c743cef7ab7c33e1c403e39d866f58363 SHA512 f0480aedbc849893d6c247346c66ef1bf78c85cd22f3a1d93a07dd18eb43704bfa64de5f59dbbf61143879118acc23e222be7a01f4dd7e6b091a4f38926ebf54
 MISC metadata.xml 479 BLAKE2B 699d8337f530cbac981bd6be4556e75e85874bed107100eebd605d3dbe01172b85a66712c7d20bbfb4310d5bf6d32df97bfe47132334ab2239190818b2fd3fec SHA512 43f00f2f4910b07e5f9db676cba1527b27f5ae4bcd49d59d118fe1e9656f185bb08535c1cc04f95bce6b59613c5b022440d746033efbbc3c26e3ade81fadb56c
diff --git a/dev-python/scrypt/scrypt-0.8.16.ebuild b/dev-python/scrypt/scrypt-0.8.16.ebuild
index 006aeaa01cab..f754ced559ba 100644
--- a/dev-python/scrypt/scrypt-0.8.16.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.16.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="libressl"
 
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 84b1fb8f4c90..0bb45687d2f7 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,4 +1,4 @@
 DIST selenium-3.141.0.gh.tar.gz 155705874 BLAKE2B f75eec80e6caa86744092020abaeef56defcfac8278dd3fd605c29d6860c1c046956c7599164ba1b4682f20dfa997f5a942d83f7ad707b052ad3ca98c0800527 SHA512 add14d426c5b929901cd71104460c7ceaacf46374b46898254dc2e2602f4a9a370199da603e3f35375c0f297d6fc2fda00c9ce2ede9d5b893b072e0487883df2
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.141.0-r1.ebuild 1171 BLAKE2B 0b6d740a7c4b81618368badc408fc0e235bcd862ae7fd3a075078fc320e025e14b86f888824f9e9be9cdb3a37d07e3e2661855b7c679544dea199f574e780c60 SHA512 34f11ac791743d8b192c7820ca36cbf90c2c1c4e6a5dd17e0b9df5dbe409a3817d869032ec84ae84f7e22035feb445cb5a146606998f623648754738df78f3fd
-MISC metadata.xml 382 BLAKE2B 2069f6989e396728b0de8e072c064980714dfa75f5bc8ac56b17d7b311e553c2a821a2d58433ca43289b059ae40f7a822c788c1af1d8eb883936662d6eb17bfc SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955
+EBUILD selenium-3.141.0-r1.ebuild 1182 BLAKE2B eac45d5dee732f9408e62b938983d2bf8138a2d45d4792c9584c6ad88945e2c231786026349af762769c77b77cb95dc9966bf9e1adf86d3b4055a552b2b8e620 SHA512 0bcd305e58138076d805d71d6822b24c16cd08d5b51d76efd0e4fe71afff139ea00cf1b10e9004ccc9861971baa5873bfd8f8da8fc3d368e11a78fda47664bcd
+MISC metadata.xml 407 BLAKE2B bfe4e5bb0922077a763a2227f8fcbd4465cf2dcc5c4e2acbc4c91bf0f90d8750c63691880338508b506fdd333ab9f858011a754089586606eead6c39c14c71ee SHA512 1fc7ba2ae78e2ef6f7dfc35d1c42120eb32a6ee9a8f15c698bdae133c7a242cc051df8321fc20f4f2a76abc7bc303b8439fd480e60d4264250a02a85c5c3768b
diff --git a/dev-python/selenium/metadata.xml b/dev-python/selenium/metadata.xml
index 07a1d68827b4..a596719b9d45 100644
--- a/dev-python/selenium/metadata.xml
+++ b/dev-python/selenium/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">selenium</remote-id>
     <remote-id type="github">SeleniumHQ/selenium</remote-id>
diff --git a/dev-python/selenium/selenium-3.141.0-r1.ebuild b/dev-python/selenium/selenium-3.141.0-r1.ebuild
index 0878736c2a51..f81431a72a96 100644
--- a/dev-python/selenium/selenium-3.141.0-r1.ebuild
+++ b/dev-python/selenium/selenium-3.141.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 			-> ${P}.gh.tar.gz
 	)"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 116ac28c1b0c..df359806076d 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1,3 +1,3 @@
 DIST service_identity-18.1.0.gh.tar.gz 34252 BLAKE2B 18823e6b8ca9444591f063b4835362522e3ae374cd669f2da299389fa2977f42e0a1d715b35d90e9518bdd8ac8c76e0adf4e121e85e2352de78e621d5f1e6259 SHA512 6b6da48c543bfbe0d9da9f0d03dbd735ce97e64a76cbf9eae2b615ced7b91c5fcca1f25353e53858c48da9c4e0c0be4e33fa4559adb50899a79689cbb372f49b
-EBUILD service_identity-18.1.0-r1.ebuild 815 BLAKE2B d76862743e03f9e641389d43b5fcc07b481f173ce0504737c5c5f8798fdeceba5d008cbe16b0ba857f27b6c909a9a35b0e2e4d6468d2e7081c78f6c4944ccadc SHA512 0f2d37c8e233dfaf6e8bab649a82c1a11cc2c899fedaf70aa6488ec0ddccd59f239c6e56e9493cc9b3346b2c35cedd93951098e54aa4e3dd9ce6792de915203d
+EBUILD service_identity-18.1.0-r1.ebuild 826 BLAKE2B cb0365b813a4b17b99c85c8bd6a5cf84eb686841de0909c0c379ac79d61f998be8764270d52c9d1e92009de2a7646181259e6acd4a5c89bc3fcb383df71451ba SHA512 882d4451469a509f2fb58b563dc32edb36e98246918db2feeb8c4fbf86f119a54d4ec8ce4a83181bc4a3fa84a56949f1d104de5e7a73c1ca6e007b5457553ca8
 MISC metadata.xml 417 BLAKE2B 756a633325c85cd35b7f10932f339fb309cad72766c32d8af26e6cd05004c163cf1349ccc61f8657d1d19728bc375f937ddf951243d775cb91dc3ec01881093c SHA512 26f165fd38aa65dd4c4d7c705b3db4e7e8bb1ddb8f7d326d1f4403c2bcb7820a9ff12d000675444fcd945201ad0176b34a695222f04ef6c0c803ff36da771870
diff --git a/dev-python/service_identity/service_identity-18.1.0-r1.ebuild b/dev-python/service_identity/service_identity-18.1.0-r1.ebuild
index 341382fac251..3e84bbb14999 100644
--- a/dev-python/service_identity/service_identity-18.1.0-r1.ebuild
+++ b/dev-python/service_identity/service_identity-18.1.0-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x64-macos"
 
 # TODO: upstream made pyopenssl optional
 RDEPEND="
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index 0f61c8ee6b17..90f804e25f61 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-git-1.2.tar.gz 10546 BLAKE2B 52b7cd8387037b1eaee91e9df7de9944ea08bf02f4cf9ea74fa9d0febf85d930af989e9a07289935d8886f0fa4439c4cb46556ff81343981153ca35314703a9b SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156
-EBUILD setuptools-git-1.2-r2.ebuild 711 BLAKE2B 4913cd17181e6a0173c2d57d60753255cece91fd7193e27ab1e7363b5368dfbbcf88568a7a945cec29e94ceef92204aabe4b7f03e6be00927cdd3333a7a22c59 SHA512 1f99d9b9ea9b8c4ca3f11fce9d571b3eacf21f792eb8259813dd23339c8c87678e5cafbad6122a6a5724321be83357fcdf434fc529715997422ca8094b916e4e
-MISC metadata.xml 512 BLAKE2B 4d7dde26fb48dba04fcb6cd768f4a825e982f57cadb98c74c696f7bc79210ebdaab5a27fb3aa307edc7fb7781f8aea64885460e67cda9f25b6f01edffa42c118 SHA512 32d994cd5a5c5314b43f52ba9d14c37ca3cca3325dac5b241acc1793583b1afd5921bb6da9b5802aee09779e9bb472ef9fc1fb330030824fb12b7d49e567edf9
+EBUILD setuptools-git-1.2-r2.ebuild 721 BLAKE2B acc543b69aaa3806e41a23b2ed1f788b48efc07e61bd9d51a86f396bbe9c2f9fad819bc52b54df3098e0781c5ef5be65b9efa02321bf7fbbfab9c92df901fc2c SHA512 490d7db8084bd91a013cf470a34ae1009cef716a822d4c73880818dfb27134e33d09b08e29850d012ce12645e9001844ca09981b0eb190bb0c451943649a6862
+MISC metadata.xml 537 BLAKE2B 4f02dbd326f87319d8ec3c73e4c939104fe907648b7638d2d905552b2efc9604f6874a3393e78791d3e9071650761b05224bf5f781bf93b18075679bb55d43cc SHA512 0bb6d88714b6ec657bbc39848070c6e6705697c6a5dcc41bd2959a42f1ce2a12b5fa185d63205e8b91029a6134fcab0298d9242434afc8cee831a51d27da2a4b
diff --git a/dev-python/setuptools-git/metadata.xml b/dev-python/setuptools-git/metadata.xml
index d80d6fe3c44f..f06e8dea8a1a 100644
--- a/dev-python/setuptools-git/metadata.xml
+++ b/dev-python/setuptools-git/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">setuptools-git</remote-id>
     <remote-id type="github">wichert/setuptools-git</remote-id>
diff --git a/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
index d5dc2508e6b4..00f947498999 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
@@ -14,7 +14,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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 x64-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-vcs/git"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index ab9fb904068a..d74f66ae1d3d 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,4 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.22.tar.gz 1050805 BLAKE2B 7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc SHA512 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
 DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
-EBUILD sip-4.19.22-r1.ebuild 2285 BLAKE2B 2b15308bce64f79811922bcde1a6832ea45a77c19a5def285c8b7daca845391a35970f39a57e9a571219d096c2780b27ddd5b3ae297d83015c87f414f6daed68 SHA512 95c13cfa036323147ca7e84d1943b1c4d30304078465d5a77199d2098d84e6347844cb05044d0816f59a7b76efc4a6d9d0e07c9fc0285c0f1b85ad9a1931e9b6
 EBUILD sip-4.19.24.ebuild 2282 BLAKE2B e0cdedf495bf84e5066e3f8a2a892ecb7042fa5d3a94e0277c145975106ed937510cb44bbebf75e9173290f1742e4d2146e9872554cbdbea003a084765f82ba1 SHA512 bc2d2cf4908013fc175d7f89baced618498dddfa58c5b95615fd8509a52a9fbb98866ec873c7042d640231d32ed3e1681721fb22e00489b32cdd057a1317d584
 MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
diff --git a/dev-python/sip/sip-4.19.22-r1.ebuild b/dev-python/sip/sip-4.19.22-r1.ebuild
deleted file mode 100644
index 0990210585d5..000000000000
--- a/dev-python/sip/sip-4.19.22-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${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
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local incdir=$(python_get_includedir)
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sysroot="${ESYSROOT}/usr"
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="${incdir#${SYSROOT}}"
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index d49f1240a79c..3ce6813003ff 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,5 +1,5 @@
 AUX snakeoil-0.8.8-py39.patch 1243 BLAKE2B 30c096614e4a4023781a1ba0b5694e5c61521116f35d026b8138b48f03e29dd5d413433248fbb2922faed32e0de30bd0329032d666c73e8a0fbb073131d843b1 SHA512 2ccb78c26c8a4df1a757422122617087ea34873de48e94d43c980d86963a2ed3f2b7e71dcc03686a313eefb07bfdc4010763eec8aef38ce8cb5786495aed1522
 DIST snakeoil-0.8.8.tar.gz 296519 BLAKE2B 5a5f6326d01874b46a5cb85f5370217f4f3dfd5743679280f1f59737567cd5d79deb945be847fd3cd47ff0ed67cc836d2a3e53c4aefbe8080da767f380295538 SHA512 ea1ff6ea45c9f5fc3bc539cc65031050093cc1fbdda869b7160b286dcf3233577ca297ab55ee3d7ee4253c5485f9e956e14ee2a97bfb88680811d1b8af6cd62d
-EBUILD snakeoil-0.8.8.ebuild 883 BLAKE2B f8b36b8e1d3b32a157f393d38c1ad3f55a9636741b0d7d339f42875db3351d985f8b8cef016a68baf453a7a3ffdba4a796944f2916dd93d7b8644e0d8bfbcf10 SHA512 612947d66d2045683dfde42cb035ce949b1a200c34c86b52e7b0191ecca7e93ac0f232c0a04fba7efce4d3cd442a73905d70f76af1ee7a7b3bac63af67587de8
+EBUILD snakeoil-0.8.8.ebuild 894 BLAKE2B 4c30ab784f3495a7e618ac0c0994fd24e336429144ca246459b441ed1d9b30b98dbf91f21f39fb7a85f3641f2c5c7ba160b3f57a121f3088ad03a311a3f38fbb SHA512 3b95671e781cb058e6459c13e3692bd79db88ad6e41fe50a9a16344412ce29cbf41a49142af1ede56edfa90a0376fa3b0f65ed478c1c320b422629009b69d6c8
 EBUILD snakeoil-9999.ebuild 848 BLAKE2B 2b3a44745fa6788b913fbc79c3719dff1e16f34f7e6957f9b5f36e31250fea527a40ff805e50f30afdf8e62b07a8757e8608de3fb9c43ff37d156f62d6a9e719 SHA512 c9e9898a6b3b1dc8f156a56dc90cd3930de84812dd22fa1ab76814065b9ea349522cec5387059ca3feadd0e468db15e39f44a1dc5d9a68685971ce17aba41ece
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.8.8.ebuild b/dev-python/snakeoil/snakeoil-0.8.8.ebuild
index 72c91229bc3c..cc51c661557e 100644
--- a/dev-python/snakeoil/snakeoil-0.8.8.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.8.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	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 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index a8f5dbab477c..3926d2549707 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,3 +1,3 @@
 DIST snowballstemmer-2.0.0.tar.gz 79284 BLAKE2B 2d9b5de8493ca8833b3b52b143e1f56b40a87cbde3f182793edc3ecfa8b3577c9ab506c19aa93870b3e03b5d86a62fb515b2df0bc616d4d88b4b9894ecde174e SHA512 d673205cacc7f6e81eaee23e6c50064af77c3c4464dbdf5dc1c3f5682dec2688fe6e7069b7ed2e59259312ba926d3be84bd846a132b6138e30b4ff2b9a9353e8
-EBUILD snowballstemmer-2.0.0.ebuild 542 BLAKE2B ef9aeb69c1089a8b87b35c7d4c62a5156e16bff86e8453f9290e62ddc65f09eec032a5bbe27e1100959a9180138871dba697653bad37666ecb271bf99723a8af SHA512 7180736bf097bd0d21b45868850288ec21d13e43a673dfb61477ea28ac68933b2a3e6e4c881edf52d3812d6ab53104eb959946b130aca0dd0d470853d543c814
+EBUILD snowballstemmer-2.0.0.ebuild 553 BLAKE2B 6b1fc6d982becc9f5e47c6405bda14d4106a227c344517c2be19a27b8b2551aa7b57f8f7c7d91402e50615da6f32d35ad19249f48fc9c4bb9b41791f1ff49002 SHA512 82f56fec48a2bdd46c336d280181183960ec1dc2531d95f09c94ec92490100d769a39e440449d700afe9dc86d4b2fd148a2fff35b4433f4f517377abf6e3fc21
 MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
index b327eb6e56c4..9e32a4982b72 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
@@ -14,4 +14,4 @@ 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-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index d86a970562f4..9eacbae12933 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,4 +1,4 @@
 AUX socketpool-0.5.2-locale.patch 615 BLAKE2B eecb66a15dff1ca068da3147b7e27618f49cb414e34a27b10949565dfac46f5b714bd00bcfc152c9d3b98b59ae4282fa5431aff61295086abcf0e5367f45954c SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce
 DIST socketpool-0.5.3.tar.gz 9793 BLAKE2B 89b7b71d9f05f7f5e560eb3cb5e7cd4d2254ff971066d236b98903d790dd96f6c580333e9fafeab7314c50f499c9617df706a20efa1c52de069c583b6dabd928 SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7
-EBUILD socketpool-0.5.3-r3.ebuild 1478 BLAKE2B 4ebd9ab64c131e3c1c9e1d04f607f732986197cc5577d7fe698d5eba447c83aec7b32c073cab7e616dcda9dbb86072d2b150d37fe83fdca41e0bde784d300872 SHA512 6f7ebadec763bb288e736e2e7e30da2d223023fc6d0fffe8d8a104164df94801d5bea84aaf6939f862d47c68f63afdd1645e45518573f6a0e875f36ebd3f2cf1
+EBUILD socketpool-0.5.3-r3.ebuild 1489 BLAKE2B 190bb5b33c4ed9e54583dcd478b6e03b2cc09c22c3e2c28529f6da231f6fee82947221388376d4abdc488f32a61e8d709cceae1d6cd5bfacb243d9c9915d063d SHA512 683b091b2bd0b98d9cbc5d3aab21ff2338fb503f0662ac41923c8de03f314a2aa8b3983947a1707dc11894775ab4c7e0d894dae0d2d4d11b8e043c3e6ae4d60c
 MISC metadata.xml 671 BLAKE2B 4830d3dca5040e6a7b64449c56d35b91421a96c703e04a3c22ae10d62d4f9f262a7025cdbfe3c7589bf2b5adbac90684f5d0c9b26bd9ca80708bc9d5fe7bce48 SHA512 8b9aeda2388b10c703b3266a206e04746204d3b66334a902adad17fc794458ffe3e12116ddd4628724c323a6f6e2620acd0d5c36055271f56bcded01205acad8
diff --git a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
index 43c365e9493c..ae25fd50d522 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A simple Python socket pool"
 HOMEPAGE="https://github.com/benoitc/socketpool/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE="eventlet examples gevent"
 LICENSE="|| ( MIT public-domain )"
 SLOT="0"
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 0d232167874e..c7ad9ca3d475 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,5 +1,5 @@
 DIST python-sortedcontainers-2.2.2.gh.tar.gz 9228894 BLAKE2B 358a2028a00748c89046069ed7ff075350d4a93f98521b48a72ba466719fd8b1eaa023f4c9d93beec1538315518f7fcc8b5b02478b1506c65fafa3840081b668 SHA512 413212aa35a80d24ec208caf19314dcc42dae207ec4ea8fdd7dc240c6fbf17372cb4c3e2209f6e40094419fa3eeb2fc9b23ad8bd7fb4e6fdaca46fd2fb248281
 DIST python-sortedcontainers-2.3.0.gh.tar.gz 9228968 BLAKE2B cdff8230d4e4ac42a89ed3192666ebf22cd48a4475f1dc173cffb0339c7f27e9cdfde1fb631daadf04adf2c00bed8a924e1202712d0ebcbd591f5542de863461 SHA512 0488e2f9f07ea7e4737ade69441f02614b63cfccb32a71af4e5953001bfa840d2e113a36a0a0a6d4c1e7fdd920ac3937b0baaea522d742547a4d81a99b8d1a6c
 EBUILD sortedcontainers-2.2.2-r1.ebuild 826 BLAKE2B 4dd5bcbff2ecb66f1bab0821a47226c2e76626c1a5d2a97f8f0e6e6e19ec1b49963538a037af7f0ffcf45c8be951f999194b141e966b9fc397f632802678aa23 SHA512 1dcab88cc861d1375526d43a8b919676d1c2cb2bfea5e0dacc379ca95b00885b60c63fc5a1610a3c79f635175006bd2b6289756240596f2c95e6f7beab847b38
-EBUILD sortedcontainers-2.3.0.ebuild 834 BLAKE2B 60d2c74398010ccb0baccdee3e3267c89d1362bd878164518c0f59d3440a84afd1671a53b0bee975b85ffabe24c233a347efd83aad13b4c8d8aa968a7c111944 SHA512 a96b8adee5c0858327d563f2325b88438dc92502a7c68b6321ffeb971752a1f10f66da41257c9d346f4cb65b5b3942ec9ea3185a450682efc292dd3d23746128
+EBUILD sortedcontainers-2.3.0.ebuild 845 BLAKE2B 0be5717261e3bd7924a136cdd8eef5af3dc4e8beda8f8fc2f68b09442a546d91ec2fc3d87fccea57c980e439c685854ecd1aeb6f3a03a88164a9bd0de24de3c7 SHA512 d632d8365304db06f123c6123c2b2b342d5379c7d4a68679857883ca6f66ecec2fb40a2ec893d8e47961072761e86399a95b96ed5443bb2a7d6687e2c9211c77
 MISC metadata.xml 428 BLAKE2B a57e7ccaa33683eb26b7c30516ef267c10ff1b5057c8a5b2327228c1ba5e231cbdb137dffff389906947cfb7eed56f1a10a630634be2fbc91e20de4b84fe5c0b SHA512 71c37340680fda3bca57ae6c9930cb0e87c4f38c469964baf41e844302aaa25186509d556efdaf67c4750da50b2fdca8ed9dac2d9f287c6f83ccec4fa7f7aaa2
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
index 3ca102a10999..278fc88c0f50 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 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 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 7d8431427c88..a0859b934ed6 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,3 +1,3 @@
 DIST soupsieve-2.0.1.tar.gz 96436 BLAKE2B 00fe9390569886181d484c5eb3f2a14352c16c3807d4e2eca8b5fe0ff0fdc1ec77fcf6b32885d76f3a085c149848bdeafa1fd2cabdd4fe4742fc175c34aa72c4 SHA512 f4ef4deee81bb31952e1d3216250712f09b425e7a2253e15bd1b38cb74b680e421e7d086a8770737898f6b57867f07f2dd07b8a98108d05e338bce92b274b85f
-EBUILD soupsieve-2.0.1.ebuild 753 BLAKE2B 2ea7c0abfdc014f0ea218f1f12a9bec5d6f0ec6791ecbdbb2cd039d1711e830062dd1288ed2145fe04c8cdbc554226afa4274ed44132ac8446375162c8e37d91 SHA512 5a144e46fe22663519b6b20b7899ccb6b7cfb3258131fe622788304dfaf72eb95ab3cd516c35fd31fd70c36811f791a7ccc99d5b2c97e133861ad6e94fb6bd15
+EBUILD soupsieve-2.0.1.ebuild 764 BLAKE2B c8bc583db94865d7b82dcbb6d5718aeb6fbf81b92e98c9be7c97790519a63921343bd3bf5a618e75ea76e308a4b639c2be0c140bfa4134b0771541390571bf26 SHA512 969cfb44ad0cd67e7323a7aa28ae253ac556dda701827baa266c286a300efb656bf35dd49a94d2bb0c13599f9e2b2785fc986a2f9d52b1d5233280873e2bbd31
 MISC metadata.xml 398 BLAKE2B 0aea8c93259062872f7899179236d9ee52a85d4055e3a5eee8e3643127611686b989c0985ed571d491734e80e45598dd1ad9e4fc25f56ba5e657b28a8a9eaf37 SHA512 36a527cf2a4572c0149f7cd344c3247309b89ef461d65347dfe30129ade1742bc54ffcc6d1483971a2adbe5e4de3a15ef73f6e8ba631f4dabba8d32a3bb2c288
diff --git a/dev-python/soupsieve/soupsieve-2.0.1.ebuild b/dev-python/soupsieve/soupsieve-2.0.1.ebuild
index 5034426eee77..7d447c78e807 100644
--- a/dev-python/soupsieve/soupsieve-2.0.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 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 ~x64-macos"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 9281eab0d8ac..6054e2791931 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -3,5 +3,5 @@ DIST tempora-4.0.0.tar.gz 47217 BLAKE2B 3f8489c584768c074874fd299d11ca71b51c646f
 DIST tempora-4.0.1.tar.gz 20978 BLAKE2B 1216472a3e03fe0856f598478267647a2a9f8f6b6e28a0e48fc9f66877303da053d1a7e793b812fa8b0909b219a669cd8d82759dfd2c0793d43cc2d086993a8c SHA512 1ee954a7053db2dc0a94637453613851806cc4582f04019e303e13566a842c2710f3c364fd54d8832d4ce2a5eaac29121db9c474b407d5b92e4f8b8ff43b03df
 EBUILD tempora-3.0.0.ebuild 1511 BLAKE2B 5076914b2292fad9eb845421042f05c19a8ccef702834ed5419c64051f7d3fc3bc740aaba6185d7b3d16319b705bb71f2feb3e9f39a6f4ab1fa929368f3530ab SHA512 c3fe5e474d92c3aa5ba417a1573648166b4d08906294494e4b726a0e2ddd6af726de1d5935619093ce9acaffd34586c30f36e121b56b9625b809f08ce12b3052
 EBUILD tempora-4.0.0.ebuild 1059 BLAKE2B ac937540f3f2e926a93c39b96770094a4484d351f2e76fe17decc6083c462de1f83d337c56111fac9b081259114dac4c415d0e357cb8884ce5ff580f25d25237 SHA512 6843bae826d91a924eab1eab61b4931df0ea7d96ade5bfce349adf65a6cfd6f352c0b81e5274ddc14cd4ff3836a5eadbf3dbbf37ee0afe2a6d96f1e255bcdcc4
-EBUILD tempora-4.0.1.ebuild 1066 BLAKE2B 3c853d256153b31d74d6a278c4f60f3f82b9b11abd31f16699fce3caff35ead8e89d31a6677529d414c083c7780483651e37e76e4b21fc3c1c1e06ec03d5f868 SHA512 cdf31c35ab3ae1c528325c5192ccc7295ed2b889c881f6188308400c88918b4a70d8b5037a3e6f27a93a3cee882526f19d0932bb7a1c97e144ab9daf4b1ee4d7
-MISC metadata.xml 615 BLAKE2B d393b579842c51e2dea6da1afde0a5571d5034905a9a4d5f4cbfa70cd80e918157ffbb1f98fbcefed28ee6c1ba20dc64e7583ea7ebd82fc1b8f9d3e57dc796da SHA512 7346fb2daa80f58a819462fe96220fa85d242795e24cc2fce5be013f4f0a678e1201b2b56bdcdd2881d95f0fd93386f47e900492862ed8b54e90ced91dd27f33
+EBUILD tempora-4.0.1.ebuild 1077 BLAKE2B 6ae477171447e3da00c730e1b0dfa72a04d6a87cfb7040e1096b458db67b7721b17e374aab1dce690bc74f7544990479a3a9ec088b0e0f4a6ad708afe13523e4 SHA512 c6a6e68e5497d3b2d6a5eb3e56da72a007f5f74c386b197d51fe1531d806c191c6a405a0b78a0210411c6bf5db0b9c94a0e5453628db0252bac92a5ae078337a
+MISC metadata.xml 639 BLAKE2B 4c3b2d750f191352c17f91ec5915dd9469480057e5272a99e305cf7f2d54a2c631fb39007a49e69169f318392564c7a58974d9483c8fb94bebc583badbbefc6f SHA512 ee76c478ca8cbb146783f31893d9b330a0b171f753ec071df2cdf6ec2fedb28f6dbb9a7d047efe1fedfbf4ee1c3ec6d7dab2889b0f358074630b12d066e52d65
diff --git a/dev-python/tempora/metadata.xml b/dev-python/tempora/metadata.xml
index 3ae289f9d10c..afb95c505b7b 100644
--- a/dev-python/tempora/metadata.xml
+++ b/dev-python/tempora/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">tempora</remote-id>
 		<remote-id type="github">jaraco/tempora</remote-id>
diff --git a/dev-python/tempora/tempora-4.0.1.ebuild b/dev-python/tempora/tempora-4.0.1.ebuild
index 7f1bf96ec058..e6008d6693fe 100644
--- a/dev-python/tempora/tempora-4.0.1.ebuild
+++ b/dev-python/tempora/tempora-4.0.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 06196e0effd2..72c180d9f08e 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,3 +1,3 @@
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
-EBUILD testpath-0.4.4-r1.ebuild 713 BLAKE2B 2c081d018ce1ea566b99d0f174b1f71370c8175c4b3e2641504e55d41d15256cdeee3f491eb0fce067334be42d7c15f561c755dadd2ccfc0b5a3229f6c344d9b SHA512 006c51a27608acbb7a386b8b77d25b9bcf37e178470b1f24c41d14cceff60cf0721821ddd4f5f85f5a1abe5b3430aeed2adf8476126b8708961500204e9fd8d7
-MISC metadata.xml 720 BLAKE2B 93bbf7d182fd5b9bacaf1da0044d0e145c14708a33dfc25aea2dd4c711e89848e0f2165acb98afb4ee383c01f8ff8d04233815169331047c0b8d7eedf25a244a SHA512 f4efcf08f277225e352339bb48104fdb33326bbd43c8dfea6f77f57d51f48e4e2b0657099fde91ae5f12e0ad661d10a6ac480b6e7dfce38c8d161dc88c163916
+EBUILD testpath-0.4.4-r1.ebuild 724 BLAKE2B c0d16baa0a54d9e205945e8c6539e6e1cb9efb12016dbefafe82f2e6f9f3f91df4680d19cf100abb9dd1c1499ec47986178e8a4c99112e703b0b8d38b3cf02a0 SHA512 464406bbac57c4ae5f4ae17a41b1526322f2e6f1e7b5d00142576235f5dfacff349cf2928358149bd53ed560310e81ca49712f4050aeaad3883c206b940b7ce4
+MISC metadata.xml 745 BLAKE2B 917478463f8d0023a23ab009f9d387dcd45324c6d3c583a0cd0003954612e4fc25982135e8b741e99f8f6a13415e5b1c35a1f0471a3142fc16cd23233dd07de9 SHA512 8580dbe33bc24a3d1faa9c662088e3e4eb27f619f3858f0567c22a26147b55d240f998c0376a08a6d6b34d0bbf58902d39a84f310bbce84ee3877cec847d482d
diff --git a/dev-python/testpath/metadata.xml b/dev-python/testpath/metadata.xml
index b65b36caa561..05a85a5849f4 100644
--- a/dev-python/testpath/metadata.xml
+++ b/dev-python/testpath/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <longdescription>
     Testpath is a collection of utilities for Python code working with
     files and commands. It contains functions to check things on the
diff --git a/dev-python/testpath/testpath-0.4.4-r1.ebuild b/dev-python/testpath/testpath-0.4.4-r1.ebuild
index 58fd14108670..02bf322448bf 100644
--- a/dev-python/testpath/testpath-0.4.4-r1.ebuild
+++ b/dev-python/testpath/testpath-0.4.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 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 ~x64-macos"
 
 DEPEND="
 	test? (
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index ab8e3323b76e..3b2b15a7320b 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -3,5 +3,5 @@ DIST toml-0.10.1-1.tar.gz 22559 BLAKE2B 17d9d9c78f2b78a6fc5bc0efd8530af5514d2f96
 DIST toml-0.10.2-1.tar.gz 23325 BLAKE2B dedab7d08dadca963e62d64e9108e254dd73b78761985faa892792823027befc6473ae02c35c275a216b4544d1af8776afa78e39c63c95eb856e2bccf1de49c4 SHA512 5c706a3ae336e6b29bdce9752b91c677f7610cbcc1af4169cc24779e248031406cd19ac367725b2aa7903e4b1db71fa59255238c0270b2c146fd5d7e12d9a5da
 DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0
 EBUILD toml-0.10.1-r1.ebuild 1056 BLAKE2B 4d18ac31dd79412cc0cf7bb68bd3c0dd086452bc0c80b20efedc7a2f8456d5c834a82ab0fe1718caecb7f876e6ebc43ebdd5d51408b42fb442a3c219e029f2e7 SHA512 ba7fb9b2f169b73c3074f97f0920221a2cb01b255a6b085863a449524036d2052103dae995ce160a13f0d015bbc517062c1bfe832c4cfb201fedde46c2c56a48
-EBUILD toml-0.10.2.ebuild 1000 BLAKE2B 6237f4e0c470614da1deba93029bdae5da04d52e834577d587fb106f80190b29e164098074439dfe815cc2f3ccb6ab02cbc80c6e64cec06f584357b739911749 SHA512 778ed46fba5c582474725d235c403ed729b364253a60c0411ef7ccb77d4a3c65aefaf488bbb163ae4e21a0ac348cd6d30ca5e10df8bde2f7bf50d1fef9676aa1
+EBUILD toml-0.10.2.ebuild 1011 BLAKE2B d4f650c986a6115b4312aba7a3f3335ca3040309e551f30120615fee0730df9267b2b226832fe09ecd4556694b32d9042de1ad0839ac3b10be19b1f41170727a SHA512 31109b68c6f0855132c8f8a1df6e41e872e7a91e5512eb89853da5154c3db2517f120d544c0319c654d982d1b1504902ffc4508b118e7ee07df59beb1f3696d8
 MISC metadata.xml 349 BLAKE2B 2616a9e0b3c28e61eed2c14cb21f10bedfa7440b2e82a132cb2b26356c2f79f0a4a73d42b59dd6a8e1eb03af8700e637e851664eff281d84bace343a4b0f9ca9 SHA512 2840c365fe21c27f1bfe512a2a85312116477427f4cb1325fbbe4db2c0f653fa8af7c8ca5c6160e5c248a5e055146d6e1d1bfbe563de6724810c319de2138f30
diff --git a/dev-python/toml/toml-0.10.2.ebuild b/dev-python/toml/toml-0.10.2.ebuild
index 2e0e4cab9bb6..b62d25f5d86e 100644
--- a/dev-python/toml/toml-0.10.2.ebuild
+++ b/dev-python/toml/toml-0.10.2.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 
 LICENSE="BSD"
 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 ~x64-macos"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index a7b3be4a6eb3..ebc7c9dc3c01 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,6 +1,8 @@
 DIST tqdm-4.51.0.tar.gz 152976 BLAKE2B f9cef9de6a77c21e40394edd006fbd8fa913af4d3a9a8ac68bd9fde81b1eebc404f6fab90d9aadc57ce2ccfbc3a2f8d8879b151f6283dc34edc25d70f69ae6e1 SHA512 04bb2a173b9b79b76844fedbc14572fa955232d1dcb6ac55b7265c4cc7a4f712f2c2965ac3bcb9e10ea1bd041593230b047365816bf508d457d873a2d4830d3f
 DIST tqdm-4.53.0.tar.gz 179940 BLAKE2B 022fd8eae70a38306d201981bd6c2e469791abc86e3e10bf2bcbe4936e4e6791dc24b3e064c6adb830fd908a1544389fdba8f7017bee17632925c1bcc3d42349 SHA512 ffb06058a71e31497ced0b6b5ce8671a7e958968e0a08e1b68dc9f3a9acac415c1708f6669d369ab484bbc07a8fc06716ed32fde70f22c0dbd8242417f95a713
+DIST tqdm-4.54.0.tar.gz 178664 BLAKE2B 68d0f054b2c95079e13ad9df3e9467f48925311151e5eed94795d3fab232301da99c2704daafd80f748037a467d25416913f0921d6b7c44d725c5ed6861fe347 SHA512 dbb2a61df848ebd84ab805134b7e7297e1cf7626abaa830a08159ce7b1852eba40a6a7f2cc7c8445294a184bbfbd69bf08430371f3e2d71f6a622a271ba49e95
 EBUILD tqdm-4.51.0.ebuild 1027 BLAKE2B c47a37c8079b09dc693ced0c8d0ee726854f0c25e54963df1e02702b5f60c60daed45bc8ac64a77acba7a7dcec27e6708ad8eb2e45d78b95eedd177f3b6eb7e7 SHA512 e2668a9b0b4a671af3845cb11dcd3b282cd079321caca6ea5c56b5d13f9f85f4e5904e3372325f17d0e15693e7bd992266daa5248552d9dc1aa0c19264527a25
 EBUILD tqdm-4.53.0.ebuild 1127 BLAKE2B 20af0f808d46e5489d9b29a6250314a2b3ea888cd40d522ab24b5673be98677ea7ec0c1a616f5d17056e32dea05ca3391962987bbcb52ca0a374d6c535965f7a SHA512 58e6a57ee3fe4c46c9bf45abba9ad16eea8ed68e3356fa43d84783dabca35eb9b76105acff61b2543fddb9e2a79c43fff182ec812706fbb33ab528a40ac21db5
+EBUILD tqdm-4.54.0.ebuild 1138 BLAKE2B f7ac9812c91b2490729892e257dfbc0a573b0915486cadaa1e0fb28b924797c91ad69c3741ff342be24a5f1ce903c54b16fe5cb6a206520bfd3ffa4574d4ca80 SHA512 6015b3906b0a3a300b3dda84d09221309b2e931d9afbc4dc28334117ca2e0e0b4d2d9aaea639d480c39c00fb7627e12bde919399a89282ac5d092ecdcbf7de98
 EBUILD tqdm-9999.ebuild 1326 BLAKE2B 984897423b7a16d82725c544ff1efa1984545d9438ce8e857eb9f0170cbbc18337c18d7d4af30dbe9a462948bef89c6bea81c74ee2590e4f3955d308649f5086 SHA512 a16afed262e1155ad2eff7ea87b4974d4632bb62ec42761902f9648509093857fd28e7878816f9f8bef2245643453feacc0a0d50454baaf5ea8e7e42538928ef
 MISC metadata.xml 827 BLAKE2B 58d9989c380867ec71e25ccd9bb5818de73112978d422a30bae0230ae1b87af04e3e999d6dc5480303b0caea284ec1387497371d5698e63c65bd07b5ecd8c07e SHA512 a1a68e4bad52c71f46664563338b2ea5273d603a914bee55ce427f23ac6bd29a452a0a6dc8375ce9f4bd77f2b9386972cfb6719aced4964d9b9793cd0aa2e270
diff --git a/dev-python/tqdm/tqdm-4.54.0.ebuild b/dev-python/tqdm/tqdm-4.54.0.ebuild
new file mode 100644
index 000000000000..bfed1d06c33e
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.54.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Skip unpredictable performance tests
+	pytest -vv --ignore 'tests/tests_perf.py' ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install
+}
+
+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/trustme/Manifest b/dev-python/trustme/Manifest
index 6eb7ca6c7946..5df5f57f357e 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
 DIST trustme-0.6.0.tar.gz 24062 BLAKE2B 77f72ab225653e5cd4fdf57b22c4a227e7f186370cfca795df57b5f3c1acdd72b920c0a4ed8364bf2ab4b367a8cda71550d9ff801d6e864eac9ecdef91d947dc SHA512 9fda58320f2055d2c23369d2df213994cafd9af7b7eb3933162bbe09a81abd7a9cd2b2e7cae43b25d40d20311213d8a1c13155b61498b848a2850d22fa1e1418
-EBUILD trustme-0.6.0-r1.ebuild 754 BLAKE2B 11beff19cf57ee9daedf3516a257c33cfbad4b1eab64770d6c4e77c40c4a912f7fbc342c40ba4d665afc3e4149b4ee5d50d2607b54513229543b18573ebf3e44 SHA512 2875ec053c369c2db579021cf177b920abf51b2a8b8410d37d72eafd8082fb217535c68dfbf3cadd6dd10c38f0914ec441a659ec7205225ca3860066f21ea526
-MISC metadata.xml 349 BLAKE2B d750432001725ac1266b82b174011a342b115739dcce7a9ba4da4465a907f64620f0e5e4e38cf6b41beffc4021cfd070b1f68b6da88f2a309f44c45d23b4b40f SHA512 6152f78467097c2e5ed0c65dbdf6bcedd84310b74c9ee92efda96fb855db3f0f990387a48f58f34e2c9f4769bc0f7a28b1c6c4be7e9561f6a3c4a22fa279cf0f
+EBUILD trustme-0.6.0-r1.ebuild 765 BLAKE2B 91aba74fea2a55d103546b9d279288117559329e2129f4e7710c97f40009f5de17e2371248d77807a20499c6c2fb80aab4734ced641e07cc213ab5fe4d5858d8 SHA512 a4eff14f11bdf5e4dfe76d63c170c20ade185a4129aa4a534fe12ac306fa2ad1c0a749048b1c03b2c2e51026f3cdee35ea20071fa0c553d79d787f35ceca2158
+MISC metadata.xml 373 BLAKE2B 4b67794d0226bac81e37e7dec42b160464da3d0ebe118eb4f91a81d4394ca63387d2088331af6dba5a79db94bd04b9093d2f6ed5ba5eb3d68d56eae0709331c1 SHA512 dd29b9ab2300c0ad8282708bbbcc43dbef6fcb2bd7f8849f3f6f7f61f4f17bd07afe02649596f25c707bf573c18642d051f0162f9451debdf7470b935c8ff3e3
diff --git a/dev-python/trustme/metadata.xml b/dev-python/trustme/metadata.xml
index 9f8e145958a9..986c7fe8b64c 100644
--- a/dev-python/trustme/metadata.xml
+++ b/dev-python/trustme/metadata.xml
@@ -9,4 +9,5 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/trustme/trustme-0.6.0-r1.ebuild b/dev-python/trustme/trustme-0.6.0-r1.ebuild
index 37ff47546a7b..2e969925fdb1 100644
--- a/dev-python/trustme/trustme-0.6.0-r1.ebuild
+++ b/dev-python/trustme/trustme-0.6.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 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 ~x64-macos"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index e0dff8db5994..8b6bab91f25d 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,3 +1,3 @@
 DIST twine-3.2.0.tar.gz 145280 BLAKE2B b25fa984486a375e09705703a47994b529f6e5b48c6733c0a07b57bec6c0dfcdf4096d6ac6b0f9b7a7bfebfb32ea1cfb49c5de79f29495eb2a8fc59a5f8de4e5 SHA512 9959430913ea570d22f2d8b94e929af36b409b71691b3f66de8ddb77cfbfbe36590e21a6062db2a4a4f56ce2eb96984b0a474a93ea96b7734f53ada7a6411c28
-EBUILD twine-3.2.0.ebuild 1992 BLAKE2B eed30ccd5fdb3fcf3496e67bffaff114450f11b22450bee8251e0d69a0f6a068964062d10b58c067b97d89b8e08cc631a43b1c64cd440908d7603a2da195f4ad SHA512 e8a78e1c1edf5e0783bff309b8c0b82b09793e00a49469c39ad8883b626497ef1adaeceb8b500c17b81bcdd8fb3fc3a6ee66f089d08b557e15defaf06cd5227c
+EBUILD twine-3.2.0.ebuild 2003 BLAKE2B 4392d3d204a839284e3c54ba56d10b51c75d6a2852cef8f49c5ac91c203846ed26da40b31feb7a28797d1e236f4e0a144573a7fe25a73e14f89aa279802be39d SHA512 950e8060810229d2fff8f0863689a2b5a94c92a73c676c327a2869d307c7e340b49f842ec1e4e763b0e49a967d262c7cb097ba8410dbe04c444d65a41ebdf1e5
 MISC metadata.xml 382 BLAKE2B 7b1f58005d26a36c877707986c59a6ae3549b9e8118f01fc87aa05a1f7dfa4271ea2100663d49b7b5b8f278409e96b2dabcdb0d9a74809bba75d440fd42d88bd SHA512 c4ce9e0c6029c9efb8be9b36720281ed4ebf0d829e3d936d0a7a864d8f42b1f7c71dc8b605717547ac004bd94c7baebd5b2d2a224899fad0efa0747124ba5bfb
diff --git a/dev-python/twine/twine-3.2.0.ebuild b/dev-python/twine/twine-3.2.0.ebuild
index 0d274b54a4fa..a4ec13e3cc3c 100644
--- a/dev-python/twine/twine-3.2.0.ebuild
+++ b/dev-python/twine/twine-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 7167b23e0421..cd97f6b3e0f5 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,3 +1,3 @@
 DIST typed_ast-1.4.1.tar.gz 208587 BLAKE2B db874caf459cb73345305051a7c4e97244e92b28e94e82f59b38bb91b7c6c69a2531a81c84d483eca8d641bc947f6aa1b98ba59cd880f7560fbdec55bce41787 SHA512 a3154fe723aeadf998694aba0faf516e5b9abb876e4c7d91843b3694474ff6911b3e77a6cb7366cfa8e5a573b331906b6a0b134b25627aaba0dcbe92c4e25590
-EBUILD typed-ast-1.4.1.ebuild 575 BLAKE2B 7c659a96f3a4d8ef86294e23df53c4fbbb1608061d1e9ae7571e28ebc29a9eb8b708a5a6d0a38993844a4137ca07c827445b960e31f35e97139f827649747082 SHA512 cee375c74449a155a7620e3b81df60e741a9401369925872e5e0f643e382c5dd67b39a5d48541dacfd8d93312d2189fd7314fd0f3a57442f75d1e4461112448a
+EBUILD typed-ast-1.4.1.ebuild 586 BLAKE2B febabc33ed2726f68456a56c89190fd62a5cd2dce5809d99ea1cec283aa89b1bccd0272d59d2ef6a0584ec681192f47625b2e5b08429e716ad838c38bcfd4b96 SHA512 50ad5ef166d759b9a06f384441fd3b6910f3e594257eede921120a7270e5385813b55375430ac88539db6093ed9626d1018559bc193cf195aee533a07676c0ad
 MISC metadata.xml 368 BLAKE2B 857d763576c4a8d9d13016cdb5c18b5bf343012143e58356e823dbd40e0899e2b31cabdbadedd7958b45f7fd6c2cfe47995b2f8262bcc596047f15375e3807aa SHA512 e72d87878400135962ad878c3bb8f44b267eb0c733c88a1f53f3459744a173a8b7fab2be08a3eb33867dbb2dbabcbb023e9293bf00aa2ac8beb2951a1e334009
diff --git a/dev-python/typed-ast/typed-ast-1.4.1.ebuild b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
index b79af83794d4..236b66d38a3a 100644
--- a/dev-python/typed-ast/typed-ast-1.4.1.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-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 ~x64-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index ab514ad9f236..ca05658eebb5 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST typing_extensions-3.7.4.3.tar.gz 38979 BLAKE2B c1b0cc4d5d66f43628f6b488aefdcdd9878aa75cd426fce68aea6039006c1f0126f1a492a817e5a18d2c611aa399c5415d8b5e047b58868ee7b8b2cccfe13825 SHA512 fa1f96b73b13308ddb2676684862916aac8741be4523387c6a0f682a52d307190aac3e4149317842e686d14483d8a37a9e1de2514a2d1ca86f9ae9c8b0e18eb1
-EBUILD typing-extensions-3.7.4.3.ebuild 718 BLAKE2B 27bf6ca202290439d5f6361604f4038b793c40d4fe0ff9c54d1b010a90d069ddba5e228e1437e51e15adecdb8b4ee88b1360f0295054c60d44475d55d9f47cd0 SHA512 8dd6eab93b943054014de9a5bc8942b1152931c8ca4f79326b79c03193fd556ae6e81e8a7cc496bb6501968c4bd8cde55aa7ea70eed98f4850a10f4452b8782c
+EBUILD typing-extensions-3.7.4.3.ebuild 729 BLAKE2B 434c8ca9d7715b43f71d3b47cfc404c9f08e1e7708d36952ed0ad6f225a3d7abb59df23406149946df6011ea2aaf25672b7a871377dd24e846384731d0e6c134 SHA512 a6fa995b6a29a160c885c98c5936ac8b7527214cef3fde10b9ea2ec483174895b5d6625b40d8e415f29d565cf9d39eb806fe775e93fd3d89f81ec9585d6bf1d9
 MISC metadata.xml 333 BLAKE2B 7c8ba2188c6cbc930151cad7d365c6b26677aa23348454bf307f4549f296857681c2d871af330b7c889f38524dd63e3abf782ef5bbd7f5f606adcb60741c3461 SHA512 b411ac2336820d0fc123dd6f1575d92d001f6c472537fb1a4899b489bb2f223955e86c5a5a89f98490374ffac231cfc678472c14faeff56c33705850f3d23e0f
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
index 0ad35ce658c3..805b1ac01ada 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src_py3 || die
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 595fea0bcd1c..ce87121dd9a8 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -7,5 +7,5 @@ EBUILD urllib3-1.24.2-r1.ebuild 1703 BLAKE2B e1804f51aa6a97428113bf331bae402b83a
 EBUILD urllib3-1.25.11.ebuild 1881 BLAKE2B f2a921171089005271e27668bd1c48f67443dbe116319da9f43fec2b235045b5ed5ebd5f4349aa0c48e0f45f9b11b7ffde5a1ecfcb8d1c675b2ca95cd578c8cf SHA512 11762392c093a018d44cdfe6b31ae885614e326e61f81461cc22da982d1b98713fbf9597c20dad9ca8b04fb7568c8aa1e1abdabeb542abe9ebe13c8f565a2440
 EBUILD urllib3-1.26.0.ebuild 1890 BLAKE2B a25bbbeb8323df1d49b70a64693cae36153a7d7b8a1c146fe3f61db1fc402ec2ee119ca98da4c7d564c2956b3b1bd9c8efa55a86c84d5351397e64e0c737059c SHA512 40d5958b457670f4e37daa87276ff82a83feeb3cd611fc0b847960c3a339ca3d1860dfeac9fc00628eb2e63e09827a7b022e85f1685419d7e46184689a5465d0
 EBUILD urllib3-1.26.1.ebuild 1890 BLAKE2B a25bbbeb8323df1d49b70a64693cae36153a7d7b8a1c146fe3f61db1fc402ec2ee119ca98da4c7d564c2956b3b1bd9c8efa55a86c84d5351397e64e0c737059c SHA512 40d5958b457670f4e37daa87276ff82a83feeb3cd611fc0b847960c3a339ca3d1860dfeac9fc00628eb2e63e09827a7b022e85f1685419d7e46184689a5465d0
-EBUILD urllib3-1.26.2.ebuild 1817 BLAKE2B f4add8e01bbcdbf01bad63c4e6bd7174b0b05e7d94473ae7760d8031ecb7da0b3a9cfcacb2d427d30b6cdb0bbde8200eed0f96fa1bf1362089e63116ca96bdec SHA512 982558b576a0ede98917b0ea7fbdbbc5a39214ffbfd4b4acba2829f767ad3ad1af745192874dc9884898466f98a6636952e974d99c7f98791416b64913c2fff8
+EBUILD urllib3-1.26.2.ebuild 1828 BLAKE2B 3a27af42833ea21292351a0d1fb903f5a5da4d270028a2ea5034932e416b4b6c1eee05b3f73515c5b8635d7154f4829c23fb1e45a1379e0005470db96e593cb8 SHA512 89b717a8434b6833994381b095ece61ae7cd89cfa70c68441ae3119cc1c277f6718903f19c6ae36fb8ed3bce40dd308a81e28edff90ba78ba46385bea079d1f5
 MISC metadata.xml 548 BLAKE2B 47edce866bd0c727c4b945630c97f2944c34f8e81c43bdbe57e28c4859dd3e681c64eb2d3b75101ad41c85587890ddbc819a2fd04188331dd5fad23a1d9d0ba9 SHA512 014f625e8de5ea3f00628fe360db47dde9dc82efd0b11218b4118a20b7638bd4e6ac14253888073740c0dca4a19a196567cc2af1864d52f3e1c959389c77c9d2
diff --git a/dev-python/urllib3/urllib3-1.26.2.ebuild b/dev-python/urllib3/urllib3-1.26.2.ebuild
index df599361eb58..88cad5ac5164 100644
--- a/dev-python/urllib3/urllib3-1.26.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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 ~x64-macos"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index df22b017f069..cc520112a1f9 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,3 +1,3 @@
 DIST vcrpy-4.1.1.tar.gz 329508 BLAKE2B b6981150a8fd742301e0d7897d84855c741c97307bbb5c5751680f3d33d69d6333a18d714fcc14cb018f5dd6c02e840e1313136660c4459e2755d448fc0b07e9 SHA512 afa1904bff37bfd2d278ed49fa3982a357eb6bb113818b532044da0f11a9dd877cc152d7f0d81d88bdc0f870521b1241f6aecf959f668211904e3c6c7cea4ad8
-EBUILD vcrpy-4.1.1.ebuild 1427 BLAKE2B 57958cb3e941c62a8220658aea15261769fa5d305a6dc44f7252949fabac0f9e4a28566077ecb9b010a334133c9fd11540c09d5425d99553b2bde102c51b8705 SHA512 4e8bfe7dc76fe35c08b0f4fdd490ed71a38dbf4e790b39cb05d49f23fbc03e7bbc945960012a5a73a4343fc4cbb9f53111cd6abb7fd0b9b24aee566f039b58d8
+EBUILD vcrpy-4.1.1.ebuild 1438 BLAKE2B 3e8ed85931759e409da6c9acf10f6a637d2011a26a9beed39bb39abb8f2cfebfb06855e10d26f01f5c411e797bc7310a244e13258e37932d0c0e1318f40e9c6d SHA512 a3d8077e5a1563a0f76ee7cf7d9c4ba7f2a6ab9cc816eb6431e83997b63065da993dbd8218e4963c5826f15b60b6fcd9f76882b77c7382e145a832c17d169d41
 MISC metadata.xml 387 BLAKE2B 09c086ca73a9932b1ac06f46f7c7ef216db357fe831fd6d8f996acedcf24a636420752130597318f4cc0a8d11a584d2162a892ca412403d1bbf15cdd86a1fbaa SHA512 09ba6aaf53089115dc98031b4dba4d526864b6d38ba7950fc3fccd9c2b1a0e14702f5235b3923a41300fabd4152e06eae22e20e86b54795bee453a184bd8828e
diff --git a/dev-python/vcrpy/vcrpy-4.1.1.ebuild b/dev-python/vcrpy/vcrpy-4.1.1.ebuild
index 3fb0d4e0776a..5b98bfb01754 100644
--- a/dev-python/vcrpy/vcrpy-4.1.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 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 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 1b231c14faa5..6e4e57c35f77 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -6,5 +6,5 @@ DIST virtualenv-20.1.0.tar.gz 8284462 BLAKE2B 4356c9c49f7bd2dbb6cf8998be5cd39708
 DIST virtualenv-20.2.1.tar.gz 8286055 BLAKE2B da77c51b352e979f05515107df49101a70f97da01862ae92aff0e185065edf1d6d517ee68057f1f2efe5ee999dd9dec24c0f2967b1f10130b446e83e478ccbd1 SHA512 e7877a9766bc47f47a07219258201ad8457ca587a04d61119a0516da43016dda4b5cfeaf725dd0b06f1f896ac8af0f3d7a2ceed3d3f35ac7a4b6ecc607c84118
 EBUILD virtualenv-16.7.10-r1.ebuild 1959 BLAKE2B 90c31ff96e46d24169602a0f034bf02f0d5fcc4132b1ef12a06226580ed2737398c889a0f752cd14c99f310a72642664aacc27024a65840a8541e580ef601deb SHA512 ab7f3e64008dc6320e2d0a280087b7ae26f934eaa7d571e2f8e01c4e21db7356476fd002918b6217bb52827f22bcd6f8e527e53c1011824d8d32be99c452bec8
 EBUILD virtualenv-20.1.0.ebuild 2561 BLAKE2B ec380a7e74f591487018c4c6a52aa2913fa3569dd8773f0a825c474465ec8f8eb043cc6cd11627d16235a53021980798fd504d37e40df557594e433c27489843 SHA512 f238950a65644f6898d49085f99a7eefb57d7a9ecaf9fdb0ccbf727e5c3076f157fc0bfbf2574850e5a3eb8ec1aed50390e648eb199aa3d8dacb34ddc5e5c51a
-EBUILD virtualenv-20.2.1.ebuild 2570 BLAKE2B 56a63bdb988b5b1b008f161ee29b6a8e3ea062a1c7f02f53452a4195deee5fa718573bdd917b481631cb45be701c8b487bb82f001447642be2c8d6dac8914edc SHA512 fa44d78fb50f0755f14b0a214c0209d75f161ed043e32562bc11d737d9ee66d1570654977d2af8b2f871e8be95ad4b111ada41935e5b3b516269c819ac3c2145
+EBUILD virtualenv-20.2.1.ebuild 2581 BLAKE2B 603603c7bb8c6d4e2061a85780a0d637948ca3158e76894582f269e0f5ad4872b35d83faa76c524e08148aa7a66dc335a5fe2d10f6e37b79a62a55122eff80d0 SHA512 8daa292af1b911411a1389a9ba7c47c36c183def2331b635af53b185c9188b6325c9818e08952d8ebe9cad4accdd7b157d09aa40efa997d5fc03309b1b7f78e7
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.2.1.ebuild b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
index d04924a4c67c..c264e57be904 100644
--- a/dev-python/virtualenv/virtualenv-20.2.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 32ed37e5d1c2..be9d14fe0dec 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,3 +1,3 @@
 DIST waitress-1.4.4.tar.gz 173124 BLAKE2B 5521b6c983cb23bc768986e9e8d19e9fd94b1dc632661b0f136cb60176b8c9a81306b8c9604b2a5b4a1a821346cedfcea281f49ecd81686a944f60b387e1cdf9 SHA512 87d57f8cd241e3c88c30a34351d57255dc1388b5ce1bb216e1b94760db09c1f184d20ea5797b20a91bc2cf0815b5067569099f4639291b4a79e885c0ab8a9fd9
-EBUILD waitress-1.4.4.ebuild 656 BLAKE2B c8737d6bb06fc87df369c5f3d26dd3673e0a93ad58d7748fdcc3a662f9389aa6062e8a91cc419643196ab722b49a40d4027385b3d0dbb5f20b189f031e38771f SHA512 5ec766157ce7e51bed550cb36ee43682ae96d0876323e290402345ace33dc6317595c6a13ba931f73e19f6934fa30102e1c0587409f931c8a4dcef6c195e05c2
+EBUILD waitress-1.4.4.ebuild 667 BLAKE2B d28b7c91ee8c0b27a23716c151557664f8cd3ed9b4d0aa7edca4b3b5ec16d08bf95dad4a988bbdda3d90ac20c72c5c4e710ff0ab362f59890777a0b38358a2e4 SHA512 d430ea86cf24d3955275645d8471189f0b620873850ae1210be0a2f0412b367a95717e586f43649e233a8d92d759f905bb95c3f9d389262c6d43d15ec6d7730d
 MISC metadata.xml 403 BLAKE2B 7fd0afda3d808404b7b7836afbf014eda9746e3ea718bcbc4220b1a9f4d399328eee971e71e1cd3b64a0fab3621f4ce3be8632875bd5489caa7222482a774a68 SHA512 6d59404fbc08bf9bd67845c3febb4075de455b4241c221444831c09231636afb857823b747fc24cacc03656f7c310cedd426d848c55d6513f52eb558d919e423
diff --git a/dev-python/waitress/waitress-1.4.4.ebuild b/dev-python/waitress/waitress-1.4.4.ebuild
index 098f4c862094..dea74017bf04 100644
--- a/dev-python/waitress/waitress-1.4.4.ebuild
+++ b/dev-python/waitress/waitress-1.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ZPL"
 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 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index bad6096a9216..755b8c254f03 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,4 +1,4 @@
 AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9fcb8032eeabdf6801d5a66fa9cbe6f51b6dd4539c71b4ff1cf0ef39edfee689e51a6e67e30e473fffa8f2db9225ff23e3b4619b SHA512 6423cc275c2774b07819079d8fe8478cf2b322c16860b600dbd039480a8883252046a6c9fc2136ec4ff54a8adbfceeb3a8ee4a7e43faea17ec588f42a5eafd5e
 DIST WebTest-2.0.35.tar.gz 76227 BLAKE2B 2f10520a66a00cf61834d5ebe2b8eea469d4ca32155c9af3c0b78234607ea5443e695730a7db4476f5296f9b848f3950027d7485a4116e7d736fd9c33d8e78ae SHA512 ecad031702a9d2031d4e2230dc8213aaa6b1a3e9e6add296ee796aa2ef77d81c992dc24e481f721bc34711d1e33f3932d56cec4be3d62ee82a71fb405942c339
-EBUILD webtest-2.0.35.ebuild 1150 BLAKE2B b7123f75ee49433904347ca5a30185934971d191678b8a1d233bc314e9aca760685482ecd81b2490a39353a83e2e8dce698e81cd3f7c735930c61f12444ffc09 SHA512 599586bab175c16e1fb33ef75c950c1fa97f51ecfd3d686d6c7c25213485d5af9698c7363de2f907110ceff60447929f01ddfe3ee1f959db667a9af79cfbf31e
+EBUILD webtest-2.0.35.ebuild 1161 BLAKE2B f5d952c02058827bd5e58454603edf2defa206dac9dcc3ee6e2593a746924dda4387c51636e1dfef8ee3e79c851d370bbdb6f1f1bdb81de67399572fb1b17774 SHA512 bb24ac1dc1c275b10daa8766a07100bc20039b4ffd0030cd7d2ed95201cd48d91ec4428103b05f9d81174d21ee7cfafe98d0e8c23c58c5f389e098ec89a2ff65
 MISC metadata.xml 334 BLAKE2B c00ab66872fd16dfbec0b6aec890b3c086a48238228928c0149854ed30cc03d28f4677a1a222ef07c0099f9fb27eb9ae8406c4080306d06fa1895a20b2ccbbc2 SHA512 fafa09470ada71c4218cbd60b579491fe9f9dbe5c2e89cdebbd1f298fd1181ec3af3f45de60afc2f4326e044008e06c58c84f2f733367a1ab4a421fa350cb8a9
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
index 09275ae8409a..15d63f97e203 100644
--- a/dev-python/webtest/webtest-2.0.35.ebuild
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 9f402853f4f1..10fbcdf7e38c 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,3 +1,3 @@
 DIST wheel-0.35.1.gh.tar.gz 63563 BLAKE2B d1432a638b91e821cb9b9fc748567b9ad18bbfd4737cee915ee3e2c585c4758e79bcf163edac56a09f9e356d81a057214c8e84c5c75b45505c67aa761e97fe3f SHA512 34cd6d1a649842abd895418c0183e68f44e228be905041e1dd8562987fbab8aa617da9b78479cb8d56fb6bb8714ec1085b87640c385bfc933e215f6e33ccf55b
-EBUILD wheel-0.35.1-r1.ebuild 933 BLAKE2B 7be03554db426e5f3986c4bc8d83e3680b8a0568401305be12c7b56f9ca43563f9d182457315de5db52d809e44b1f93b8639142e6b72c8b5490c5a019aca6f78 SHA512 e808932d377a18236c25d7438a4cce52f6a7e14772886c47dcc71b3e72bef0d18766a8d605e7a048417c13ff0e28b2161a8e736936f96f29e70e46390213034a
+EBUILD wheel-0.35.1-r1.ebuild 944 BLAKE2B 4cf6332485911a9489b814b08ae7ea2aca18bd0bfe18a61e51695c378f97912fa4533976deb51957a1f54bb2b66fc9f329baee1ca7f4d6daf95fd537e7f51f56 SHA512 8b7ce4b5d935301ed4db5bb472ef63acc2916cc9b8e94b9c274da90bf195a0cf0b69e35beb14a2607e73ef9120de1f52db53adb5159afc943963dbf83adca022
 MISC metadata.xml 332 BLAKE2B 6c674dc3f3401ae851af12ce14e50ddfe100ffcf26caf3bd49dd93a19433d8c190fe3aabbeba3280f4eb96fe1856d58ce2a5b7c24ee15dacc4593d0534fbac9d SHA512 f0e8a4870fdc46f2a8cdb719832a7d1e108283a35f8f1a2756259c8823480509f9fdfdafdb59d9f0ec2f38c2e78ea6e2937ef5a086408e5e7aeb43b951e0c9a0
diff --git a/dev-python/wheel/wheel-0.35.1-r1.ebuild b/dev-python/wheel/wheel-0.35.1-r1.ebuild
index 63905f0112c1..060ac5945811 100644
--- a/dev-python/wheel/wheel-0.35.1-r1.ebuild
+++ b/dev-python/wheel/wheel-0.35.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pypa/wheel/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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index 1e6648189b08..dffbb4d84dc7 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,4 +1,4 @@
 AUX wsgiproxy2-0.4.6-tests.patch 736 BLAKE2B 4680b256f190d1bde89b5e8735cdd03a68061a4c68162033da329068838ea262f231a07aa6a944f9a9889c415af0c65eb3c885d9b69d9ee3fa8878003e886545 SHA512 960b5be5e67cc77d86c37ea5f6966ca838455cea74d79288e245acb47c9b374a285a3135c39330b2e8928760fd244e8addad8e4f707b7cbee1dc4801562a50f5
 DIST WSGIProxy2-0.4.6.tar.gz 16481 BLAKE2B c33dc34d430da795e8144e06e1d6f100cce7d0155295c2d3038567a048647a4f008dbc0156fd4234ce069b3f4ec01af0e42b174dd68c92c9cb3ff4e13be83f8a SHA512 c60d794c0c8b383bf1857ec325d6d0b4fce9c4aec4a06cbf9d7549b609633e491e137342b7bbaf4eec12462eabba63096328c8517b0685e241d1baecd5827cad
-EBUILD wsgiproxy2-0.4.6-r1.ebuild 1086 BLAKE2B beec6d81c66c06013b5125730f0ea63b2a81ec1635b4067605c075246ea4c16ecb213f5fc7dd77c68c6d993ce95c84f7fe3cf9ae0d2472d3e8b5851cfce05ec6 SHA512 7e80561f1d8cc1fc7ddacb1f6ed8e60915075cf4a5cc30260db98032ccd90e32200069eefdc83be71b7a0cdcab621e6f97fdc1eef74b23e71be1b3c7dec980c3
+EBUILD wsgiproxy2-0.4.6-r1.ebuild 1097 BLAKE2B e923f8c3a107d08184c41b00f4b8e29c914ce42960e0290e6106730f7b70e82a005f08d90b0357859b3b26ca12e9844f9039392687622a230cefff91f1503ef8 SHA512 447395cb510e6b6cfca532249d5aac019a0d069dd73f83e963738667681c6d074a36f30b3ef5d0a06ddf1eeb5c42db4e960d60aadfce42fd80e382af79cbd256
 MISC metadata.xml 337 BLAKE2B b34d470df573b61875a4d4bbff338d30a9bb21fc1905a73e47639fd9f3a9c3222b8d5dd54daeb37228dea119cdd354d618cd544de3ab7b46b826f70faaa9add0 SHA512 85c5219804c984dd8f028fcafd94476d0e44a09154d852fcc86194f6c1fb4dbe47228346be487aad7de0588079499c8e47cca0166721f519a8a99cb359fd4f03
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
index d524ceab7eb1..afd62d2be877 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 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 ~x64-macos"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 52313684836c..68cf038eaec9 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,3 +1,5 @@
 DIST xcffib-0.10.1.tar.gz 84689 BLAKE2B e36ad4f9c6bf5bc63400ae35d0d58ea1def00f299c0f811807cde430e6a6850132e77584359f77fb2f4ce5fdf5f22ec91ed22e1b7ce5d6d318b7a8dc5f3e0939 SHA512 98412fe36962108902dc0599f05ac9be5d7412d7f12fc6566e020c2ce84ae4a536a20ae2dfddd2dc9a536f37cd82539bf19e1993ee65f0b09c44372008cd7edf
+DIST xcffib-0.11.0.tar.gz 84750 BLAKE2B adc1faebc8f0e83150f50e1b711175f5f4617124e07a4d5744b7d1c116cdb89f6d68617cc0ad0efccf2d9465e6bbd2504ee08c322c61228728aeeccb57fe55fa SHA512 22b82844295b277e2abb363ff818e7163037542ffc1ec2874a948f3b3cc63e9a8fad371fa87099910546a17f2f6f1bfb8f62214869fa30a196fc198adce14384
 EBUILD xcffib-0.10.1.ebuild 669 BLAKE2B 053ad1204935b13c10a8ddee72fed71ac8ff7b0cf1ab5434ba28668279d293392ebfe6a228de641aac9cc0afc91c0a0dd0fbfaba0b0c428e38e0fbc05d63dd13 SHA512 ecd0dc08026ecad9944a64ee45eb604682513c6bf00633ea5bec86e6c398be8a0d86bbebd48ba03387561610ad38a103f2d0a7313b0af97e642591195e0809bc
+EBUILD xcffib-0.11.0.ebuild 673 BLAKE2B eafbe77a9b6d9cadabfd393ea2789e18799593bbf7efd665113700639be1b6df89374b6c4d978cad4a9dd487676f2e9ee314034aa38dc7f6c094dc175450e556 SHA512 d0f3a1c49ec07ed74a4bb6f98a914fa94e400a6642e384c0c9a06a556239d0c1b509beeb7d1700eac0e48737b9a4b99b19a9f65f616561570f3a7cec0df39cb7
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.11.0.ebuild b/dev-python/xcffib/xcffib-0.11.0.ebuild
new file mode 100644
index 000000000000..790a52834b15
--- /dev/null
+++ b/dev-python/xcffib/xcffib-0.11.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="https://github.com/tych0/xcffib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="x11-libs/libxcb"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]
+	${DEPEND}"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)"
+
+distutils_enable_tests nose
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 64a4f1a6b657..7eff3682247d 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -8,5 +8,5 @@ EBUILD xmlschema-1.2.3-r1.ebuild 763 BLAKE2B 3f7af1950d66b8a06f8a5ec03f5ab1328c1
 EBUILD xmlschema-1.2.4.ebuild 766 BLAKE2B c9147a07df0b09551acb0193555a0dc41ec7b6b7af77c2c05a967143631e7109fe876f1676d7c27bd7200f5f5241a7e106cda72fda9971bf627a326134c625f9 SHA512 bdcc764d8dd5e78386842921fc76bd320211bae812d9ba241480960dedd9c4587089647f28abc3ecb9b2023afc8e2f2662e02088eac9813086351cca7b369e2b
 EBUILD xmlschema-1.2.5.ebuild 892 BLAKE2B a76dc8b5d295a9088827d51129695b15a3fc788e39c5d193aae5663f1d419dfdf68de733acbd2e9e005f743d859de434be274c29eb2305992bdcef938f1d81f2 SHA512 feb3f9d9a802ad0a60686e17446f3e38ffd5b640aa9cc9e92949fbd7f6f9383cc2fb0d25c879b1b4c5f92a7005c92420d7bde8895f47ffddbac12afd5d5506e7
 EBUILD xmlschema-1.3.0.ebuild 769 BLAKE2B d9127d956cddc0f8fb552563025e852a83647a7ff29de816dc4a3ca8ebe8b81a5e136d8114c6e96157b750fed85a5db2e28058fd49e8854d2388deb757b91eb6 SHA512 ff611755005ff59170d0c283ff6ba622127b3234e98edcacbab158c46678a19f4e8b6bf94671caaf6200972c87a1d563021e1b82b0f88dd37ad96a7b5aca9625
-EBUILD xmlschema-1.3.1.ebuild 769 BLAKE2B d9127d956cddc0f8fb552563025e852a83647a7ff29de816dc4a3ca8ebe8b81a5e136d8114c6e96157b750fed85a5db2e28058fd49e8854d2388deb757b91eb6 SHA512 ff611755005ff59170d0c283ff6ba622127b3234e98edcacbab158c46678a19f4e8b6bf94671caaf6200972c87a1d563021e1b82b0f88dd37ad96a7b5aca9625
+EBUILD xmlschema-1.3.1.ebuild 780 BLAKE2B fd341466fc0e59b4721c3c2a92e04f6196ddb92255285229be982c6c5e99cdb0b31a5ad8cc258df978a49d10cdf7f4c14a5f8827d42bd4f71ab94e6a04db7353 SHA512 5c2a1fdaf9aa7feb4551aa96bdac6bbcf6028576f67fb52641f4035d78f4e04d894bf71a48f72d4d8a201ad55f581f452912cc378c599aa1e6d4d30e9ef90f48
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.3.1.ebuild b/dev-python/xmlschema/xmlschema-1.3.1.ebuild
index 28637b92bf4f..008edc769d93 100644
--- a/dev-python/xmlschema/xmlschema-1.3.1.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 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 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index c0f12de5acac..b706856e57bf 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -2,5 +2,5 @@ AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405
 DIST yarl-1.6.2.tar.gz 177534 BLAKE2B a7a587387c8030737874b445007aac4a7bc7f5552238fb892cbb99325e9a3862c599a11df5738d79e47dd1073e29731f80bd941f351e4a7b1867780fba9986ce SHA512 5e3ab46216d567583558a6945127d0d8d758475636deb0733bae25fc869d842f05e996f06aa4a7dc6fd067f7e38afdc6e328cc8019735819d2a1cebc50ca165d
 DIST yarl-1.6.3.tar.gz 176823 BLAKE2B 58d36c6d18ef661cb08074153081f541fc98968107d71e7b501297f45f38de092804bba2ae89ddcf0da79b5d4fca62292a4c460bc9dff9d723d3958bc64ff84b SHA512 4c76b94198b8e334f4b4e71d92b0fe23f752d35e0c29bc68df99648b3f48fbb6e3dd8d7339138544e5dc8fbf64c15cb61678052670ac47edc5be958df819d42e
 EBUILD yarl-1.6.2.ebuild 723 BLAKE2B 8897a20fab2df6b0adf8be24cad4981e54584aa95a376d0cbd41df756b825a03800520a3d21c25e5c349b622610766625c87a93b9346e5cee1578d3284abbe04 SHA512 61108f5fb825d7ef083e78f95ace2ce6941ccf0fae2986b5793a75346f233ec7b98df5dd3d5eeda6dee269c7736367371f9152800f14aa9059b9818122e72490
-EBUILD yarl-1.6.3.ebuild 731 BLAKE2B dc50c14dd0e15502daaf748c91b429b58bf284881c591301dbee301fc1ccd63c690ba6c70e7e9bb7f487c09b5bdf754303ebe1a9a2a52a4b59fa6d4c9a1f3981 SHA512 1c6818c83ec259d88bd9f2706c6170abdad72846e261de4f9d72edd502d243bf735965bd21c6aaddea9c5a3704ae7daa011e716774e2f10d80981b637dfc1dde
+EBUILD yarl-1.6.3.ebuild 742 BLAKE2B b6f227246bc82cb11fd0ae4e959c57d0e57bacc8d7658c98cc4c112c64807d47d4644821620c490034f6d96c14ab2e7debc8e2ccac38f0443906677be84df678 SHA512 652da71cd21ba08d43d085df2f76da1890903dd3bed0c0efaac51c0b0ed81f63a4611c19609c3697996cc145ec804abfd8f4e25f78b3777716d7da6a3fb74ac5
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.6.3.ebuild b/dev-python/yarl/yarl-1.6.3.ebuild
index 28fd8a84c1dc..71b49fc69adc 100644
--- a/dev-python/yarl/yarl-1.6.3.ebuild
+++ b/dev-python/yarl/yarl-1.6.3.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 2b740769398f..050fc7a360ad 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,3 @@
 DIST zipp-3.4.0.tar.gz 15638 BLAKE2B c06f68b9a23e6ba560cf7b703150e4b14d8bbeb5c8712c54257f587de9a44eb853804495eaecff2ad17261304da9b9433951cbb9b17e3f35446406e4e4fe517d SHA512 c791e72f05a92110037cbee7153103e47ec536994d9e86cdecb34c602839c0bf5e6e4ab4ce56d6a44c7eb4f7a555ba531df8c986e302654c624f59e2217bf10f
-EBUILD zipp-3.4.0.ebuild 1198 BLAKE2B 59acc63a9150bfd45f4856a08d4c60ab5a26e0ee4f00fdd031f3ce243e25650a1e9cf3ef7aa81fedf3b2bfc518321625dca8adf783e362a51ab472a62852c8cc SHA512 c272686ab5a733dfb81ef386c90d200e1e346e4603c0ea124459138cc608aa79eedf27cdacd8e1656d44a83eb452aa8ca7c5ee1ed92d16f2d83e0c9a2e1981aa
+EBUILD zipp-3.4.0.ebuild 1209 BLAKE2B fcfdd228f0455baa2653cd7d9b75934d5c80c58f7a12f48223ed65d79b1a099489afb1321195f32d13b2548c3c82aaf484bd6295e17ab50587141d00c80a3435 SHA512 900af3a732d2b1a3da9da3ba1ae3e9e5013ba9a53cfd7bbd6095d011b8b4b7a20d1a27eba6b29ae2b6ebc2a543e611d71485a7d4b61cf622041ccdf153d25cd0
 MISC metadata.xml 547 BLAKE2B 18466508bbc1bd39ebac74f8ae583b1f58e7444f96171132ba3521f302d179417cec21f34ea55d95b94a5ce8242ef77cbab5805f844d84de809c58f5a48b5bd4 SHA512 693f379106d242cb63a5bc2e04133d0619f168b964e9e4cfd5dbbacfb06b6d4e732d9304b2029afe28e800020ac771f5b38a0963477976cc5bc049359ef7b6b8
diff --git a/dev-python/zipp/zipp-3.4.0.ebuild b/dev-python/zipp/zipp-3.4.0.ebuild
index 4dc3ff1b933e..2cb6538d95dd 100644
--- a/dev-python/zipp/zipp-3.4.0.ebuild
+++ b/dev-python/zipp/zipp-3.4.0.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 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 54c07d12a0ad..e28420920f13 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index ee9ca652b558..bf49334f5d4b 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,6 +1,7 @@
 AUX qtnetwork-5.15.1-libressl.patch 16941 BLAKE2B 07b54a11d57609066cc245f2850dc955aa3ca3c8c5d7ea132dfcec72250b43b3e12b72b8b919bf522d3e32f9d8f2452f34b94fde6174d6fb9776bbd1328d1820 SHA512 300f6d5af014daecee0bcdd16aa896b7efebbe6eb06e6d4f5c2d59f370527edf8783da8449a4c87fca617ce2e4d305ea68c5f68854b618d257fb31a1f1aa701f
+AUX qtnetwork-5.15.2-libressl.patch 17869 BLAKE2B 663ce12ef626325e97d59c63ab66fc1233fe020b390e4e8917480b1dffd73df60717bf1bbc2e716a86e3bb96a3f56660283b962c904e990c80a8fd1e174be8cd SHA512 55d2c40f2660e22c9bc944d52fc88bc7a1fb4a09b0f831d7954055b17e496e0011084bd766054b848320cf42955b1fcb932a79bb2aa3ac858a7c0854d6a9dd04
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 EBUILD qtnetwork-5.15.1-r1.ebuild 1544 BLAKE2B 2129568d3b48d17e4a950c73f74c692427b470d9fd15c7be9e5c960fed8b276ebaf4ede53a22c7b2069a1ebb3b9986a8ba5dafdd4ec050a9c4282c5436de4989 SHA512 fb09f7261484d5786ba13e4a02b9678cb14906cbe5b8c2c23fcc3b5493714f7d969d52fdb09359dc12c2bb0950868eb2400c02b51f4538b38e9e5b8a6c6bfb3e
-EBUILD qtnetwork-5.15.2.ebuild 1762 BLAKE2B e916aa68cc83a93275fd453f95ce09c07f678dabb8b9f75ac1dee8d3bb42212ec0861a4c11c57b37f6ac5d9aeddaa16589f22b3fba2facf3de083389a187683a SHA512 8b28678754762289987a13b242b1f1f81a9695fb21da085505fc531af1cc60e00e635d7eea8fd81ea60143dd8615aecdfa411a7410e1cc9b624a1d5f522c45c4
+EBUILD qtnetwork-5.15.2.ebuild 1762 BLAKE2B 5db4ad6b82be24417ecb0f895f4a393eb84d0c84a3e9c495db2606b5909e16542ad9075459dfee2dea930d1be82a165b3a1d5f56f7cd56e8845af80a2bf518d1 SHA512 d367bf77f56fdf48c6ef4334036e8373f1ab185267910a547fdfb6f81df405632558cb386b8e0c9e5f3ffd7137cd80f2d81473c5921a25c0c459bbb005938d28
 MISC metadata.xml 957 BLAKE2B 5c888322d402a3f037e194bd13001ff3a7e449fe423b8b4661c4b1365263a63e105be92ab0bd6a99ae79e7e8062c65e52e9e04763f9c15c50cb28c1215a06b0d SHA512 aa07869c984c4c2d7653820213b94fa4db247e4e30f0efad8df64c09b2578cd2143ab81890584521e1f561953312abb36d8e049dabd42893fecefea4182f176a
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch
new file mode 100644
index 000000000000..f7fe32f06e49
--- /dev/null
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch
@@ -0,0 +1,377 @@
+From 07a00f9c6d87f1fa5360cfb8f086670f3fa5bd3f Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Sat, 28 Nov 2020 06:12:22 +0200
+Subject: [PATCH] QSslSocket: add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
+ src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp        | 31 +++++++++++++
+ .../ssl/qsslsocket_openssl_symbols_p.h        | 45 +++++++++++++++++++
+ 6 files changed, 103 insertions(+), 3 deletions(-)
+
+diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp
+index ca9d61cc..19774432 100644
+--- a/src/network/ssl/qsslcertificate_openssl.cpp
++++ b/src/network/ssl/qsslcertificate_openssl.cpp
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+         unsigned char *data = nullptr;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+         q_CRYPTO_free(data, nullptr, 0);
+ #else
+         q_CRYPTO_free(data);
+diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp
+index c9f202f5..d3626cab 100644
+--- a/src/network/ssl/qsslcontext_openssl.cpp
++++ b/src/network/ssl/qsslcontext_openssl.cpp
+@@ -351,9 +351,11 @@ init_context:
+         return;
+     }
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
+     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
+         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+     const long anyVersion =
+ #if QT_CONFIG(dtls)
+@@ -408,16 +410,28 @@ init_context:
+         maxVersion = DTLS1_VERSION;
+         break;
+     case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+         minVersion = DTLS1_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+         break;
+     case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS1_2_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+         break;
+     case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+         break;
+     case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+     }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
+     if (cctx) {
+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+             sslContext->errorCode = QSslError::UnspecifiedError;
+         }
+-    } else {
++    } else
++#endif // LIBRESSL_VERSION_NUMBER
++    {
+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+         sslContext->errorCode = QSslError::UnspecifiedError;
+     }
+diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aa..01a61cf5 100644
+--- a/src/network/ssl/qsslcontext_openssl_p.h
++++ b/src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1FFFF
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x10000
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
+index 277037e5..f599498d 100644
+--- a/src/network/ssl/qsslsocket_openssl.cpp
++++ b/src/network/ssl/qsslsocket_openssl.cpp
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+     else if (mode == QSslSocket::SslServerMode)
+         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
+index ed80fc14..6941b4db 100644
+--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -145,11 +145,14 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return
+ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
++#ifdef OPENSSL_NO_DEPRECATED_3_0
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
++#endif // OPENSSL_NO_DEPRECATED_3_0
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
++#else
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
+ DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ #ifdef TLS1_3_VERSION
+ DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
+ DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
+@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
++#else
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#endif
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
+@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
+             return 0, return)
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
++#endif
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
+             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
+@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
++#endif
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
+@@ -845,17 +866,21 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(ASN1_STRING_get0_data)
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+     RESOLVEFUNC(EVP_PKEY_up_ref)
++#ifdef OPENSSL_NO_DEPRECATED_3_0
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
+     RESOLVEFUNC(EVP_PKEY_param_check)
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
++#endif // OPENSSL_NO_DEPRECATED_3_0
+     RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+     RESOLVEFUNC(OPENSSL_sk_free)
+     RESOLVEFUNC(OPENSSL_sk_num)
+     RESOLVEFUNC(OPENSSL_sk_pop_free)
+     RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(DH_get0_pqg)
+     RESOLVEFUNC(SSL_CTX_set_options)
+     RESOLVEFUNC(SSL_CTX_get_security_level)
+@@ -898,7 +923,9 @@ bool q_resolveOpenSslSymbols()
+ 
+     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
+     RESOLVEFUNC(DH_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(DSA_bits)
++#endif
+ 
+ #if QT_CONFIG(dtls)
+     RESOLVEFUNC(DTLSv1_listen)
+@@ -928,7 +955,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(OCSP_check_validity)
+     RESOLVEFUNC(OCSP_cert_to_id)
+     RESOLVEFUNC(OCSP_id_get0_info)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OCSP_resp_get0_certs)
++#endif
+     RESOLVEFUNC(OCSP_basic_sign)
+     RESOLVEFUNC(OCSP_response_create)
+     RESOLVEFUNC(i2d_OCSP_RESPONSE)
+@@ -1058,12 +1087,14 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+     RESOLVEFUNC(SSL_CTX_get_cert_store);
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(SSL_CONF_CTX_new);
+     RESOLVEFUNC(SSL_CONF_CTX_free);
+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
+     RESOLVEFUNC(SSL_CONF_CTX_finish);
+     RESOLVEFUNC(SSL_CONF_cmd);
++#endif
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
+index c46afcf5..42a31119 100644
+--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+ 
+ #define DUMMYARG
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++typedef _STACK STACK;
++typedef STACK OPENSSL_STACK;
++typedef void OPENSSL_INIT_SETTINGS;
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
++#endif
++
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+ // ret func(arg)
+@@ -230,20 +237,43 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int q_DSA_bits(DSA *a);
++#else
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
++#endif
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
++#ifdef OPENSSL_NO_DEPRECATED_3_0
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
++#endif // OPENSSL_NO_DEPRECATED_3_0
+ int q_EVP_PKEY_base_id(EVP_PKEY *a);
+ int q_RSA_bits(RSA *a);
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
++#else // LIBRESSL_VERSION_NUMBER
++int q_sk_num(STACK *a);
++#define q_OPENSSL_sk_num(a) q_sk_num(a)
++void q_sk_pop_free(STACK *a, void (*b)(void *));
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
++STACK *q_sk_new_null();
++#define q_OPENSSL_sk_new_null() q_sk_new_null()
++void q_sk_push(STACK *st, void *data);
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
++void q_sk_free(STACK *a);
++#define q_OPENSSL_sk_free q_sk_free
++void *q_sk_value(STACK *a, int b);
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
++#endif // LIBRESSL_VERSION_NUMBER
++
+ int q_SSL_session_reused(SSL *a);
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+@@ -269,8 +299,13 @@ int q_DH_bits(DH *dh);
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
++#else
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
+@@ -279,7 +314,11 @@ int q_DH_bits(DH *dh);
+                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+ 
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#ifndef LIBRESSL_VERSION_NUMBER
+ void q_CRYPTO_free(void *str, const char *file, int line);
++#else
++void q_CRYPTO_free(void *a);
++#endif
+ 
+ long q_OpenSSL_version_num();
+ const char *q_OpenSSL_version(int type);
+@@ -497,12 +536,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
++#ifndef LIBRESSL_VERSION_NUMBER
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
++#endif
+ void q_SSL_free(SSL *a);
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+@@ -728,7 +769,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
+                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
++#else
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
++#endif
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
+-- 
+2.29.2
+
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2.ebuild
index e3ae43aa3b65..b18029d135ff 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2.ebuild
@@ -48,7 +48,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 	:network
 )
 
-PATCHES=( "${FILESDIR}"/${PN}-5.15.1-libressl.patch ) # Bug 562050, not upstreamable
+PATCHES=( "${FILESDIR}"/${PN}-5.15.2-libressl.patch ) # Bug 562050, not upstreamable
 
 pkg_setup() {
 	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 6a3ecdb3b676..b9ab6d705975 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/open4/Manifest b/dev-ruby/open4/Manifest
index afe34023da58..bb7896d068f9 100644
--- a/dev-ruby/open4/Manifest
+++ b/dev-ruby/open4/Manifest
@@ -1,3 +1,3 @@
 DIST open4-1.3.4.gem 18944 BLAKE2B 00ef3139cbf6ae175aaa40526c105d39fdfb07c69f0a3aaf607feb799f0a8adac99cd5ea5caac29c884374af6591f4049b3888626c24b3d2371d4c0c9019cc7a SHA512 838a18efcd093d55d9589ff9d5c11054618abef863224c2d9b31445dc735218c2f96d954040e2d3f8d5aab0140e54b627fcc4a1b01c17e59267402a2abdd8efb
-EBUILD open4-1.3.4.ebuild 636 BLAKE2B 762cb1ecdf3d7de63f0f407a423172e2c69919bb74776c8e9db88e398ef4b897a2d43ced60fbe2ec25c168f2236092ca0f9bb0ad7baf73fc3a32b8e2a82f76f8 SHA512 c49fad0fa4eb2902e7a5a3f1123aa4231bab547eb4df94c63385a7c22cf6ccc86c431203bdb43c053c66d5d557393d1abf5847fba53afa66d87dc8da75524985
+EBUILD open4-1.3.4.ebuild 642 BLAKE2B 95d6931e959b436c87b2c0a107df7bce994ad625fb88defe14b50339ddaf7f5c0a963a170649f7f7cbd55e4addcc9d510c5569c63d3d4635d4111dde4469ac1b SHA512 a6b7f1947dc41e26f12acdac51e5157364fda8239a4adc2ccd4df37ac330ee0c4f6f69a5161d862228d20e1c4326a0b6e18b2640db483f5924311b6820b4263f
 MISC metadata.xml 339 BLAKE2B 560d764d73e28f2679a134b33e3f281b678aa2cd53a0a271c646949fe1cd63a3d7399d33774888c8f3fd8cc55c44a5151629a8e376abc4d45f8b87f43bb9b8d9 SHA512 1a79e7584a1a8a3ca0df51e0b3f0631eb6a61f1aa529b464a15dc94abcd7de2385ce68f50db14b5041fcbec5b5d86d50d9584c524c43c89b3648f35caa23f1e1
diff --git a/dev-ruby/open4/open4-1.3.4.ebuild b/dev-ruby/open4/open4-1.3.4.ebuild
index 3184e7f55d27..0af235c1635b 100644
--- a/dev-ruby/open4/open4-1.3.4.ebuild
+++ b/dev-ruby/open4/open4-1.3.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ahoward/open4"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/pry/Manifest b/dev-ruby/pry/Manifest
index e784593005ff..3f5da2a50767 100644
--- a/dev-ruby/pry/Manifest
+++ b/dev-ruby/pry/Manifest
@@ -1,3 +1,3 @@
 DIST pry-0.13.1.tar.gz 240103 BLAKE2B da4797e36aecba8bf1a785738339ed4be1e06ab28b329b66551a908898cd0515fc0da2434ba96e9fa0f350c9d32c13f850660bc0236c6c0218a4bd3182ec4ced SHA512 bec52c75dce365db68504634b2eaf6b0f312527031401199fcdbaa3ec5a9272148239d93305f8e66c4d36513f9fec3fe045e978c5a10f012a2880ab4a16b7e85
-EBUILD pry-0.13.1.ebuild 1248 BLAKE2B b5dcbcd9acd0f436c5853518d9682a33cc89c5083def9709db75d86dff2f1d688f4f1953de12e13d44bac2eb06589187f197bc4500b457167e388ff287cbd924 SHA512 c3097a4b8acfe440ae28546dac14885cc2c8c17bb9d87dd513791581e9ea9a43e6bdb359e5b5d4cca629eaaaf70784ed4e159dbb054beb76bf9961bb5259c156
+EBUILD pry-0.13.1.ebuild 1254 BLAKE2B 6dcd658e86ddb9421b6203956870e7912f4e6d1eaa5eae93d4f66071667c3f288bcd5fad93855604fe49fe676dfd152a83d45eb410ef4c3fe200e6e9f45304f6 SHA512 c3fb2f31965fa566d0e52ea9e379e25b68cd9b0d608e8f0d9b05306be560fcc1a2fed16deebd9029f6d068eac3ec8917cb5ac47beaa9d482c1ab5a3fdfa4c22d
 MISC metadata.xml 333 BLAKE2B 0c32ac9d2cb59e7aa1dfca56e88a2a38b783bdb2779c9336eca40d06770f02252442afb3372c1a786bc491693548c145079b3aa8e61fefeb0b81209f0afe3fa5 SHA512 4bd968aba7e36044799dfb4abba1a0127c4aa4ccb4e7d1830dafbf27c6c9e94fcc29ad008dc527cf2c409c8308dee14f803946afbf716bc22d9d3f716b951887
diff --git a/dev-ruby/pry/pry-0.13.1.ebuild b/dev-ruby/pry/pry-0.13.1.ebuild
index c8dfd0ca4f1e..a6ccfb80e171 100644
--- a/dev-ruby/pry/pry-0.13.1.ebuild
+++ b/dev-ruby/pry/pry-0.13.1.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 SLOT="ruby19"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 2a494084c2dc..37f7e54ab123 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/sigscheme/Manifest b/dev-scheme/sigscheme/Manifest
index 6555249af3b6..79487bf96885 100644
--- a/dev-scheme/sigscheme/Manifest
+++ b/dev-scheme/sigscheme/Manifest
@@ -1,3 +1,4 @@
+AUX sigscheme-0.8.5-fno-common.patch 355 BLAKE2B 6e6b4e7156eb2acd748b43a05c2ed636129942b84125a74f901174b532437766de0970b19386e4340814466d3839e0a35f42d9b77c62edaf74550c10e334494d SHA512 f4697d31692238a83d00ed9c9cd4b2a5e1c5cdffe96cb59fea2514bc878f382888a4175066e679b8b16da6380d25412b85c9a66f079a56b983c6fea46f5d6b42
 DIST sigscheme-0.8.5.tar.bz2 1117490 BLAKE2B b7757151d0a9f37c5a717e3e6114560706be834eec1306f5bd0da28dcfd6d68d4f7f7869545fc299dd1972555591eeb3885e1ffec2f11f9d2b2e9b1c01d9ae9f SHA512 88cb9aec0ddd71a6cb6ad70fbd0554285538d17f2d9c888914101a1e5e16ad4ab65dc30c2b6f25d450af903e408bc903c516cc397d9f2242979cd20607686313
-EBUILD sigscheme-0.8.5-r1.ebuild 400 BLAKE2B 542ba26943124a0f7c048f09c6745deecdfbccaed2eca52d326112d1341aa8c4b67a25bed5e0fa51456b9d9176246d60369e48c3f693ef1239589a688f7037e2 SHA512 f0af1608ede941b43cbdb4dc4b5165d3b81f6f31338b278850985e184ba497a8f5204a822d8515eb212549088f03c25d53d0aa450a655247b9bee945ca2802ae
+EBUILD sigscheme-0.8.5-r1.ebuild 525 BLAKE2B ac0e0a18200595a7d21610712955174d14e2d946b13fc73e6e064eabd668fe02d93e135723ff2c4cef0d00d6ad0e1f5049e42b59291cde3b1a5f79e133afc2cf SHA512 9cb8fdcb2f3bf3d6955aba0646b4b9d48a0345fd0082689e9eb363d0f63583b243a9ec3650c04c779c7d7e1f8ec887d3d654ac353e1e34c6ebe43dfa00a132eb
 MISC metadata.xml 729 BLAKE2B 6006883a89dcb6afe351a2658a0cdb2f3753fb5cf87b36104ccbee298d944ad3856f4d92c01fc9411d250c2c33c6c84ba7f397e71b2a7ea7ac8a78621ded32b1 SHA512 e31ba55c22696074c4f1f9a86d9811220aba54704e5ebae30f51ad54f30c958890f84a7ea335354af18a257c92ae7547e609f744b4270d7d7c52f065777216a0
diff --git a/dev-scheme/sigscheme/files/sigscheme-0.8.5-fno-common.patch b/dev-scheme/sigscheme/files/sigscheme-0.8.5-fno-common.patch
new file mode 100644
index 000000000000..efac2648a28c
--- /dev/null
+++ b/dev-scheme/sigscheme/files/sigscheme-0.8.5-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/libgcroots/include/private/gc_priv.h
++++ b/libgcroots/include/private/gc_priv.h
+@@ -1979,7 +1979,7 @@
+   /* the signal mask.						*/
+ # define SETJMP(env) sigsetjmp(env, 1)
+ # define LONGJMP(env, val) siglongjmp(env, val)
+-# define JMP_BUF sigjmp_buf
++# define JMP_BUF extern sigjmp_buf
+ #else
+ # ifdef ECOS
+ #   define SETJMP(env)  hal_setjmp(env)
diff --git a/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild b/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
index cbed33d141c5..a154c41664dd 100644
--- a/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
+++ b/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="SigScheme is an R5RS Scheme interpreter for embedded use"
 HOMEPAGE="https://code.google.com/p/sigscheme/"
@@ -10,8 +10,14 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_configure() {
-	econf --enable-hygienic-macro
+	econf --enable-hygienic-macro --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 95fd04f96928..e1b7e59d29ec 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/android-ndk/Manifest b/dev-util/android-ndk/Manifest
index 1db929059bbc..a799e9042df9 100644
--- a/dev-util/android-ndk/Manifest
+++ b/dev-util/android-ndk/Manifest
@@ -1,44 +1,12 @@
-DIST android-ndk-10d-amd64.7z 459151600 BLAKE2B a624109010c317da74b0fe2d392016f7019e30bfea8794bac57460f25f36dd5133a438e55b34c834c90747f24edb83ee3d2b1b6d2e5ff77a6c930cbf8f264c54 SHA512 b2ba10d7757ed7189b4e6dc2ecd38fce0c32dc6701151542b9e225e890faee84dded30dd4e907b0e42473e2a6df8ef4d46f37514edc270a04e1129d9c9e677fa
-DIST android-ndk-10d-x86.7z 449997190 BLAKE2B b7bf8434635e34e3008cfffa0ac048365ec6a0ce7c7997033ae1799fba45fc7e5cde7a34848d79580f2ce9178dc86d02721fa25b78bcb82655609d929dcab82f SHA512 8d66229f6f07d6fba00650a96267c3c4a8308d296d9f13aa359af34ad49f57ba3a02e39f14d2b04609816e5f28ed939e71024043a0f08dc3711895a42e39f771
-DIST android-ndk-10e-amd64.7z 401522849 BLAKE2B 2a43b6300bbf18895c31293341215c767307cc7765fb1aa80754a44c97e5eed270acb7e2143aaed18fd080f1f5866bbcc5f98d9954950a9dbc27f558d22e9fa7 SHA512 8948c7bd1621e32dce554d5cd1268ffda2e9c5e6b2dda5b8cf0266ea60aa2dd6fddf8d290683fc1ef0b69d66c898226c7f52cc567dbb14352b4191ac19dfb371
-DIST android-ndk-10e-x86.7z 394281908 BLAKE2B 22c5b0e42c275f9266b11676435ea03af0ca40ea784f507bb154827846369ff8b0fc765be7aa61cde936b768619e6d05583766be9477c28fc6123a13c5e522f6 SHA512 fdce2537c4f9bca980948961448ec746bca0626b92c1edf0db46df34819b6ea2f6acb4f0921c3ff8da8e20dd6b414749c6cb3b973d7d1cdecccb4b8f4f2e0679
 DIST android-ndk-r11c-linux-x86_64.zip 794135138 BLAKE2B e048c6c7172aafce47e5961669e8130780a060190854316edde8e2aca763055cba8bb739dcb8aa51227a798d19b36a11bf2e7591f817070c153f05a2e5d74fd4 SHA512 c0de562061c9f08bcd1ae05b1de26898788e71cc7dc40502348214edd5a90f1bf8125721e587b341f6fe774fc79b1a6e28b3f702f3275e016baa0382fcea2767
 DIST android-ndk-r13b-linux-x86_64.zip 687311866 BLAKE2B 2db7bfd9fa937d5f28fa238494e73ad1d09c539627308aa7f4e2c4114c6762dc908b1752b42dccf792f9c71ff7e3b5e08b2b03e7eac3ff5bea497c33d479d60a SHA512 39f3bd2d0e1daca11870df2e2ef318ad070b19163a55e2c1c4a1a871e02f8ec51263d7cf4b6da54eaadbe4253b5c11b85f4c5aeb67fccfff9147a5c420589d12
 DIST android-ndk-r14b-linux-x86_64.zip 840626594 BLAKE2B 5032893ee34e7167c5af5216d7b1357c3f9dcef136d63fa9a1d6c4849471430ac21a741e1c2439ec62b5cb1fa79af9ff39b46c31073e47e7a6f7c41e1a1a448b SHA512 24435267fc5acae559aa5159f7c895ce5ea0cbb8ef966bb8ff0dadffcadccbe46bc3880d285bf4e411ef78632cf2f862408e7b2b41ebca51078b41eac66a301a
 DIST android-ndk-r16b-linux-x86_64.zip 852525873 BLAKE2B 18f6e602d88ef0a8f1a7f31bc127547c32bc2fb133d5c87ca4d2f7099f79b54d67f578a68fcd59e94c84934ca2006decca5b09eac566f2f99d609862d4036e48 SHA512 94cd879925ee3174a9267e7da2d18d71874173976b362101ec06598a94b6587a33671e54bbbce5778c04418aacbb831e98386c16f6cde04574ea8c8589553dd7
 DIST android-ndk-r18-linux-x86_64.zip 556932539 BLAKE2B 52bde148e142fe72402d8ab6709b1dcb611f74c0cb8b511b3f0e69a2b6940ee5e05b1d4bd45fdff80f74f65ca3d8176de46bd0a3aa28e2dfd430fc07eab23d69 SHA512 7a8b372be53a7d5a008b6cafda451096623af33aea910edd8e98ee4b15682da5d2ad641727ab12eca522ba965073a3eb247cd3cd850c9b602e2c7b1cd6eec708
-DIST android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2 241172797 BLAKE2B c3aad099b68a1a605f06fdb9d93b929374c81481d6ba1502e9ad363c7437032465cd516bc9bdf205a4f9f8ea536865755970046f0f7db4070f32e0f18f65c606 SHA512 4c8f1c9c6dfe264f227959124dc19f9fc9596c166076b8ec82b37f033101285ccd5832962e233d2605869308b2367280665a1f53f4693cb753434b480c49af25
-DIST android-ndk-r9-linux-x86.tar.bz2 419862465 BLAKE2B 2e41071a2b17104cd9b5ceb543ca154936a1358722f5fc33ab221227e6a254954fe687fe7a83e2dee72b189f0ac8ef5a11419297c1a36fb45451f797cc2bb85e SHA512 9c2da6b52df00ff6177ac18314f7c7abef585d2297362d426a9b0a28c8319531d684c1515971066050181178ab205210a7f25ec1de9be843fd0da7c1e897747e
-DIST android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2 244427866 BLAKE2B ad7c6e83ff0a8509750bb2ed302eff20dd4c451e5b55ff2be07268f007361a5023e1b4c8a175efc896e9041df6b1def54946a028dca31d432e48105161303171 SHA512 dde193474b46ac2ceb69f5ad3ba106eb840daf18470538d85e147b17dff8b1b1b848d499727e28bb8e76bdd16dd4bb99dc073c06f80949080551ae0437f08eed
-DIST android-ndk-r9-linux-x86_64.tar.bz2 425113267 BLAKE2B 8f0143553d952592e68600d096acdbfc23f9365c40e746ba5140790ed2d16fa7b211b747eab4fedc94b03cb2f635222b3348bf3beb6a1f4eb5c6b3b9137b4fb7 SHA512 4196a71c20ad2f12bb5d3fe994179e76ba6e535a5460c34ff07974e74afc362ed271a20c24ac565e8f8863bca152f24befdd1954711d844200a676ba08e1a0aa
-DIST android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2 125676842 BLAKE2B dde44911f2e8f9d187c7331391781ae3199a43fa86c410f99a47cfb78bece7d9220b0f4acf2b363adcc2497d696bb4f8afa4f42776616ac038a5f9e2ce461560 SHA512 a6f7189b033a55b4623d4831c35adc635faf80393da217aeabc959d97a246347b8d67150b086ed8f13cd93313d06563f54aa8f29f887d23ffaf8f8a3ac5d3876
-DIST android-ndk-r9b-linux-x86.tar.bz2 361394055 BLAKE2B 391ae66c8d7c7169f8856524912872765a677bca9e9c80e7aa8d32b3d6c9bbbcc0e7b40b67ee98d7ae24eeb22584612f169a2f3833066e2cc4c7291bfa50d436 SHA512 e8448f2dda591a1e18bb2dc40d6682c19ca01b7d6914fd079e7e6b86cdc152a3c05f7a3853714bfa5b1df7c3eb3f124ba7912caef53fd0d0a335b89c352e8a94
-DIST android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2 127742633 BLAKE2B 4179d354f2dc0da2ca47038040ecf7f6c6432f8e6331799c12e5cef5c1123c237a63544353c0cc0871e886131163a3fa0180d09805675f20d32b295c60e33fbd SHA512 eeddc80ec3cb75a248ab8e66948a5e5001812cb19213541e5fb85b9b30cae6aac62849c91c9dfd3af2f822382060b069d2efc21294d2f87824be695e9d9abc50
-DIST android-ndk-r9b-linux-x86_64.tar.bz2 366988131 BLAKE2B 7bde89583735c76fdcae5cc62650fd52ab96387abe33625304fa65a93e4abb84033ef154ebe268de3de9b3accbc9b2907c781f1ad1b2e02c21bd00d22153af3c SHA512 99eb950ceff8a6fc931859fadb1151326b9fbcfddf1ac8027076b3a4ba5d746b31c38cbde925ab6882510a7b39d93b93b0ff346d452db5c364997bff1bdc0887
-DIST android-ndk-r9c-linux-x86.tar.bz2 365412557 BLAKE2B 85cf37c729ef1c904e5925b59729373f5ecefe316a6a047d9b270ebf3834691ae97e1261bf365452248f0324a3d8500dd0bddb5d0792113bc521996107b76680 SHA512 ebd85d9670956db60fb3842a827288d32df70a7b2febc0477fd2ec63531fa8fa61a89a3c3916decf6dba7ef3f2794121ffdd3c1b8263b0e9c259650e44dfb675
-DIST android-ndk-r9c-linux-x86_64.tar.bz2 371254928 BLAKE2B 5ab13083f7322acc5d8cec44f9cbbc2e115ad0693f3f720004d951ae3ab3392dcf493fc8e3f62956978a284f25f2a70461ab6f498979095df0a6a06216ea7f56 SHA512 317a3904561c850b9129a855fd353a7ba706986f08bde709d16ef10c6adffe546cdf3cb48e5e19a0261f33edde4b2d3b6f5ae9aa59280ec0742dbdacbba93755
-DIST android-ndk-r9d-linux-x86.tar.bz2 405218267 BLAKE2B 477dd60f45e7305615873e62ecfab91c02e0cf903df51ce38fd1096371d48585632df402944c79372c4b78104c70444eb2538e8bbaa83b59caa6305a5dd8df1c SHA512 9ba1603d3ac5daf8816dbc7ba998d6b93d4f3d197a30beaaccb02fefe785554769b453462c90fe19194200808b38128396e77c32425c8d0872652c81a916304e
-DIST android-ndk-r9d-linux-x86_64.tar.bz2 412879983 BLAKE2B efbab13b52c6653b7a9ca5997992feb87a637fb42f2b560b3d7bb5c7c8a645c21dbe3deb3d0a85b35c3d084089fd7da6870ced1fc1977388513572eb60cc1767 SHA512 b6b663533785fb6cbc10e467a109cf47f4a49d87abc72f03439ac7b3aa57350e1602d766793bf6c3c5f6e4f4ab8733311ef1c761ac335691566b2e936f853af3
-DIST android-ndk32-r10-linux-x86.tar.bz2 420078216 BLAKE2B c8c8c8b36478d80644cd6e960876bec90b854217d9031345f03d6b2beb4f249a8ff324a7d348c15cc107815089481f48dd973183eacdf0b410171d26436aca51 SHA512 c3acf611b360bea4d559341c4093d1194fa3131ad807ad9aa8f6c159c12bd4979cadc65388b9826baad89c0ba6a4a03f192ddd885c50f0066022ae3265d8e59c
-DIST android-ndk32-r10-linux-x86_64.tar.bz2 420671390 BLAKE2B 75e2419882bfe7f4eed2e594a00319813873a87e9e8e1f03e2ce983e3946f9e6506a5fb43fbc0698cea9c0a12a1e3cc1b020c7e1f8b8c0c9bc6b7989567df641 SHA512 004e223b741c8b63ab86bd37f2c83d89457d5144e18221e792676e070ffb9b23078568b52abee2067de7daa0dbe5e8152bcc82685273d60e1a243b3c5f159f84
-DIST android-ndk32-r10b-linux-x86.tar.bz2 421052081 BLAKE2B a67e476b3db70c4c156dcd696eb2003283f8a5896269e0ae14efc0f199b3a724916c2d3f2b001d246f7d882faed1fd181f03eb6a1c1599a75642a9c453e87681 SHA512 ecd270244c9f00b9bf883014f65a04459a5cd422e65239b13a463c363b9e82d7907495792bbe1287dee082117c03356b1f8d869339a4cf1966f2a56ae664aeb9
-DIST android-ndk32-r10b-linux-x86_64.tar.bz2 422237011 BLAKE2B 8fe0c4d997601dae7a8b5fe2b55208b38d243b43be7e454bd513c9b3753893c6ca1f2f14ca88069fd0012b37be6f2c593506ab377154a7c740c006c6d267435d SHA512 6b7ec25a7c2d6cef94ba61403274276a912c5fa757dda5206548619fb155e97bd6eab0eb3354f51f703b82300a754ec8da352aeb20cdcdf80884aaa4bcd97a6f
-DIST android-ndk64-r10-linux-x86.tar.bz2 338544906 BLAKE2B db13857a6cf2363c1ea211edfc13155b3c3331c2a473826d56371874d766603b6c786893a1aa7c0135d56f7ae17fdb594f44dfb41697fae07ec0403152b4e9c1 SHA512 09a54fb86a7a157e9dac5a682f2cbae9492fe8c2f64a23f613d7e331844eb682e8e4affbaea116895310f417514bd85b66e6841755197b9add4e84237114d4f5
-DIST android-ndk64-r10-linux-x86_64.tar.bz2 339708042 BLAKE2B 4b674564a66a431d54e17095a946a3f36e51649591dcd930efa5792d9ad3ca9e4f54b2af4036200a4328bb0b17a6b28f08971487d7d3fb60c4672b3169a24560 SHA512 2d2a9689912c72e1f3ef5c14acef1b747460531b234d9fc9af25de7102a0195406c47e5c6e98cd5be2a58163fbf76eb1cbf3098a84f93b5c68c18eec94625a9e
-DIST android-ndk64-r10b-linux-x86.tar.bz2 358060577 BLAKE2B ac5c54840b273c5c0527bf2654228f86a5b301cf60fcb702c0d4ca033622da1c667f8f75d9c89962ef73b47e2128d1f79612032d3292744027cfa3c7aa3d4bb0 SHA512 c951a3a50d0db66c435190a6a8000467785932fa1ff000d59b9f4c5917ddf78874df3e2163b5757c019a68a3dcb13492f486248f30d0c762279ff5d67327f26b
-DIST android-ndk64-r10b-linux-x86_64.tar.bz2 358835298 BLAKE2B 79ac6c56c24eb642b53420a9c3dc125b9e44aa359436d153b20644178b2800f8705f27fb4aed509cf66a868b92643def9d7e746acb4a9f2fec760189237cacdf SHA512 95627d327db205b7a3ec1fb940a8f1509dcde3c2367d779cc06dd7bb2ffd41f3d2eece79bf4578279a571a42233f58109eb6586330b11844f98c79fa410f2c37
-EBUILD android-ndk-10.ebuild 1797 BLAKE2B 6a26192283f6c6edca63ad4459f78a68b89c3bffbaa8d21e62dee7dcab0f639039c72fa45dd262f4a9631e66889ac11588034d52b3c8b84b96b82487bc75bcc5 SHA512 f23c6b1461f1f89c14d9d444f3d159209ba28f2245177539ee99f919ed7e148caf68689816d9facce93d4f5e82ac7d78b7323e720eeb1e7bbfbe398893e9aaba
-EBUILD android-ndk-10b.ebuild 1797 BLAKE2B 6a26192283f6c6edca63ad4459f78a68b89c3bffbaa8d21e62dee7dcab0f639039c72fa45dd262f4a9631e66889ac11588034d52b3c8b84b96b82487bc75bcc5 SHA512 f23c6b1461f1f89c14d9d444f3d159209ba28f2245177539ee99f919ed7e148caf68689816d9facce93d4f5e82ac7d78b7323e720eeb1e7bbfbe398893e9aaba
-EBUILD android-ndk-10d.ebuild 1609 BLAKE2B f38ad58f191799d48e85c418d7809e1c1a80af5e899d6c9fdf22fad45d9d85b3569d126358b9ec1e8aa22bc481ede8db1c174574cdf053d00c6b010ec74e5810 SHA512 7ec0274d7414eeeec873f63e94c02a6d8b07d781ab5f41312ab5c896668d3edf45640080783354595a7f82b95ffaced23e11f51946c267d907227bbfe1aba972
-EBUILD android-ndk-10e.ebuild 1764 BLAKE2B 21366acf6129d6c5398d152d691f00458e472f753c938468eb4e09b413a928a484c54b24ad6c256f0df2435b1ef09242f5911aefd13fdd740fad5aea38440af7 SHA512 bef3475150f2e9df18b1c59511e3ee5bd4ddf2d44b13bb4fb9e400985e3d341d67dc01969e3c221ed5633b386e17fa4338c847aa0bcc0876c6c47722b632dbd9
 EBUILD android-ndk-11c-r1.ebuild 1656 BLAKE2B 702b84d098e8282aee3b354dd8846eb690c5545b01cb79a052c8d3ec04811ea8a5cc68f8216838ddcd9ead44d949d47a20314122e82b114839adf882614ac633 SHA512 d11a182dedc7437b4c9a05f76226b725f8f4555e32f8d474b247284a869614373c94a38793eac635ca6dd83fa0cefd596570b7b6bcbea667b7fd975fe4d09206
 EBUILD android-ndk-11c.ebuild 1609 BLAKE2B 89017fd82e4da27e65887839054b55a82a71fa6b92a9da6bc5cbafb1a3021ce6094438f42271f707c8cde931c8d29b4228f8aa44cbe5835553554232e8904efd SHA512 de1024930711675b5f9f7fa2abb06e7e13ec2d614fb5230590dbbac00efbfc91f09d5b1e145f4eeb48b800bfe64afe0044a5549e9ee6c7978a4972068886934a
 EBUILD android-ndk-13b.ebuild 1656 BLAKE2B 702b84d098e8282aee3b354dd8846eb690c5545b01cb79a052c8d3ec04811ea8a5cc68f8216838ddcd9ead44d949d47a20314122e82b114839adf882614ac633 SHA512 d11a182dedc7437b4c9a05f76226b725f8f4555e32f8d474b247284a869614373c94a38793eac635ca6dd83fa0cefd596570b7b6bcbea667b7fd975fe4d09206
 EBUILD android-ndk-14b.ebuild 1625 BLAKE2B b5dbbffe75041e39cc4cf06924b30e6027ee15890d264e9318b969de59c11db34ec405b633c80a093251935bfaf5ec772ea5a96e445d0a5d57d604d033d74abb SHA512 2a9086e9760eee0b99f90a1fb7a52de645c1c7a365046f21a2028256b1e14537d7ed67d334be5cc40418c67586300c6742d23a23d7c1b7bd93e156033ee07263
 EBUILD android-ndk-16b.ebuild 1625 BLAKE2B b5dbbffe75041e39cc4cf06924b30e6027ee15890d264e9318b969de59c11db34ec405b633c80a093251935bfaf5ec772ea5a96e445d0a5d57d604d033d74abb SHA512 2a9086e9760eee0b99f90a1fb7a52de645c1c7a365046f21a2028256b1e14537d7ed67d334be5cc40418c67586300c6742d23a23d7c1b7bd93e156033ee07263
 EBUILD android-ndk-18.ebuild 1599 BLAKE2B 6f6a12c4998777d30c7e805f4babaf9ce5ad8b4798367a7891fc316f96c26a0f94907907614e3225cbdfe8bf693feb9c183912aa3384ea9c860f29f2de3f6453 SHA512 97e74b4dc7a0a473d0514d33fff4e9d25eddd91318c2cd3aedb2fff5fd341ab7e7af0ada41e7cffcf46b3ce50a2e4e64aa35b2815a910c9ff6f99e947bd48274
-EBUILD android-ndk-9.ebuild 1801 BLAKE2B 3cc7b9c78df9a96ab3c6e06f313596de2a18b94612c559233610ce1e94ae97889bd51353244d4e45b2b80f5d66b62d2367eb7b811df31eabdd62d51c6aca0be2 SHA512 9894db5c7cee9f67d29bf3a7742baf9afaf3f0bca524bfaeb9a1d049a8449b79bc65ac93b20cf0f6edcbf48ea0ff492978f8014801d662673e1e95d691954ab0
-EBUILD android-ndk-9b.ebuild 1801 BLAKE2B 3cc7b9c78df9a96ab3c6e06f313596de2a18b94612c559233610ce1e94ae97889bd51353244d4e45b2b80f5d66b62d2367eb7b811df31eabdd62d51c6aca0be2 SHA512 9894db5c7cee9f67d29bf3a7742baf9afaf3f0bca524bfaeb9a1d049a8449b79bc65ac93b20cf0f6edcbf48ea0ff492978f8014801d662673e1e95d691954ab0
-EBUILD android-ndk-9c.ebuild 1569 BLAKE2B 260433e5147dd5f8d814a5bf63dc074644e276ad25481785fcfba87545c27230a21aed6f7ef09f004e22de7d47218e05d7c97e99cefdd1ce7e138cf696da492d SHA512 f353af0ad3e4ab5f467880960e5addcf60875c4091f9ca67ae9619bd13e640ae68fa8426033683945128b89b5917f3ef419ec519d3f1f2c934d2607bad77e248
-EBUILD android-ndk-9d.ebuild 1569 BLAKE2B 260433e5147dd5f8d814a5bf63dc074644e276ad25481785fcfba87545c27230a21aed6f7ef09f004e22de7d47218e05d7c97e99cefdd1ce7e138cf696da492d SHA512 f353af0ad3e4ab5f467880960e5addcf60875c4091f9ca67ae9619bd13e640ae68fa8426033683945128b89b5917f3ef419ec519d3f1f2c934d2607bad77e248
-MISC metadata.xml 446 BLAKE2B 9630bc6c3dbf1e3fb2b9f19d09e96063a8ecff18e0bc83164798b06eda48d09716eaba5331c0451ae61c8b27790af513f0ea8516f6ce743faeaf90248a861ecf SHA512 aa4e337d6a8dc9a9189a8adf9c963237ebac937cf2a7ecb9c81e17ca7cd496000bd0fb34de9314c18c360b100b77fab8e4a923d21228694003553a80c7b17ff3
+MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/dev-util/android-ndk/android-ndk-10.ebuild b/dev-util/android-ndk/android-ndk-10.ebuild
deleted file mode 100644
index 9e3a86306f4d..000000000000
--- a/dev-util/android-ndk/android-ndk-10.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="x86? ( target-32? ( https://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86.tar.bz2 )
-		target-64? ( https://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86.tar.bz2 ) )
-	amd64? ( target-32? ( https://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86_64.tar.bz2 )
-		target-64? (  https://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86_64.tar.bz2 ) )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+target-32 target-64"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-10b.ebuild b/dev-util/android-ndk/android-ndk-10b.ebuild
deleted file mode 100644
index 9e3a86306f4d..000000000000
--- a/dev-util/android-ndk/android-ndk-10b.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="x86? ( target-32? ( https://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86.tar.bz2 )
-		target-64? ( https://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86.tar.bz2 ) )
-	amd64? ( target-32? ( https://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86_64.tar.bz2 )
-		target-64? (  https://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86_64.tar.bz2 ) )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+target-32 target-64"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-10d.ebuild b/dev-util/android-ndk/android-ndk-10d.ebuild
deleted file mode 100644
index 188dd248d7d7..000000000000
--- a/dev-util/android-ndk/android-ndk-10d.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86.bin -> ${P}-x86.7z )
-	amd64? ( https://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86_64.bin -> ${P}-amd64.7z )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-10e.ebuild b/dev-util/android-ndk/android-ndk-10e.ebuild
deleted file mode 100644
index 964677aabb94..000000000000
--- a/dev-util/android-ndk/android-ndk-10e.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86.bin -> ${P}-x86.7z )
-	amd64? ( https://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86_64.bin -> ${P}-amd64.7z )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
-	sys-libs/ncurses-compat:5"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-9.ebuild b/dev-util/android-ndk/android-ndk-9.ebuild
deleted file mode 100644
index 4e8dffa028dd..000000000000
--- a/dev-util/android-ndk/android-ndk-9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}-r${PV}"
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2
-	legacy-toolchains? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86-legacy-toolchains.tar.bz2 ) )
-	amd64? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2
-	legacy-toolchains? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64-legacy-toolchains.tar.bz2 ) )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="legacy-toolchains"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${MY_P}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-9b.ebuild b/dev-util/android-ndk/android-ndk-9b.ebuild
deleted file mode 100644
index 4e8dffa028dd..000000000000
--- a/dev-util/android-ndk/android-ndk-9b.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}-r${PV}"
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2
-	legacy-toolchains? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86-legacy-toolchains.tar.bz2 ) )
-	amd64? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2
-	legacy-toolchains? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64-legacy-toolchains.tar.bz2 ) )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="legacy-toolchains"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${MY_P}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-9c.ebuild b/dev-util/android-ndk/android-ndk-9c.ebuild
deleted file mode 100644
index 3d508dfc5c87..000000000000
--- a/dev-util/android-ndk/android-ndk-9c.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}-r${PV}"
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2 )
-	amd64? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2 )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${MY_P}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-9d.ebuild b/dev-util/android-ndk/android-ndk-9d.ebuild
deleted file mode 100644
index 3d508dfc5c87..000000000000
--- a/dev-util/android-ndk/android-ndk-9d.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}-r${PV}"
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="https://developer.android.com/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2 )
-	amd64? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2 )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${MY_P}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/metadata.xml b/dev-util/android-ndk/metadata.xml
index a4cb54d29397..76f45cdee0f4 100644
--- a/dev-util/android-ndk/metadata.xml
+++ b/dev-util/android-ndk/metadata.xml
@@ -5,9 +5,4 @@
 		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
-	<use>
-		<flag name="legacy-toolchains">Install legacy toolchains</flag>
-		<flag name="target-32">Support for 32-bit targets</flag>
-		<flag name="target-64">Support for 64-bit targets</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 6e301640720f..7885ed4e3cfa 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -5,6 +5,6 @@ DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875
 EBUILD aruba-0.14.14.ebuild 1746 BLAKE2B 419b70985f18519c23aab2e13b006d867a19ae534fda30c9a4ab88a3df18bab5a38b74b5614c8fa00f1577acca27b90ab260c05de2da8700133d33c71edbc97f SHA512 84eb8be2f99c0e7a65a61450ed56ddf632565da6db96e1b10e5cd5dffeae24f476a765507a2e57fffa22a7d90447036967f66cd346bf03c7151c5797d6118140
 EBUILD aruba-0.6.2-r2.ebuild 965 BLAKE2B 4988dd0014e07031f1ed9e4e2dd052a4e16f4c3692e2bac9a724ccad35bddc88694f1b622b71a75af997e7f09dd1eadf3ebf89b330c64bbeab7368b19a61ae7b SHA512 2e2be6948e70a9826ab445ab002466183ede2a185b40ab95ad78d218d0df32e0fe10bc351567fdb1eacdd04a3cc2d7bd290b42fec2f5459c758eb711a8c1f4a0
 EBUILD aruba-1.0.2.ebuild 1922 BLAKE2B f7d9aa054e862cf7aeef26a322a067ef8b279c8a96a472471aa0dd2a027c0e06d66908ede4730ccfeeec07c76dcc52657a497f7040d9b83104a60cee83d4f032 SHA512 e8451f0ec7ec1c9967dd0046050eb01b96ce616c55fb50ab98705595ad4b98b747df4be1c468da45163c710398d2de2b253d3b3ff58f042153f45e30664bc311
-EBUILD aruba-1.0.3-r1.ebuild 1962 BLAKE2B 5121d8d5e5b6db8b66b04988f99ae73878c03cf2b57889d40e4e33f298cf69a91856792b70c574a295cfd6cc072f170dc8f5b533e25eb38a2a44611145944563 SHA512 4c80de11a4cf9799fbf3ca52d0a6899c0657ef57c4d18b5ba6cf1ca11ec5c70a6994327fb61461d7ae7bb33e393e7f73731bb0688d7a75a7a351dde6b69cd877
+EBUILD aruba-1.0.3-r1.ebuild 1968 BLAKE2B 1423a47057cd55850ddffa55a807832d6c88a3d6c52b40151e6722f7b06c2486c6757286f184528e34b962ad39e87ff4853f94fa3422febf8c79b67529ba7fad SHA512 145d0ea4cc31df24758d3baa19567b82fc68a2a890034d3e03fc64ade8ea262954796c96f421bf77e45de6d79cd4db99cb59a25d26e71fa79c4680e18c35c897
 EBUILD aruba-1.0.3.ebuild 1955 BLAKE2B 0b36d1b42e8a9cf1ca22a19118189f2a8bcd5291cf8e4626d2de1542fa3352a0e9c2a777394f93b7bc92888debfa32673863a52137c8077cc0b97040eeded385 SHA512 25587725ee21665a2d36bbae4eae8e836cc96f57b95b974a7dd0f0ba0e9a8a8b520451e1543d80ae335d1ad6ab00b681beb67bc294e71ad0160dcad5e732053c
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-1.0.3-r1.ebuild b/dev-util/aruba/aruba-1.0.3-r1.ebuild
index 02c6b6cb9ab7..c9d582ff382c 100644
--- a/dev-util/aruba/aruba-1.0.3-r1.ebuild
+++ b/dev-util/aruba/aruba-1.0.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/cucumber/aruba"
 SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-util/babeltrace/Manifest b/dev-util/babeltrace/Manifest
index bad01d67fde5..fa62542e85a8 100644
--- a/dev-util/babeltrace/Manifest
+++ b/dev-util/babeltrace/Manifest
@@ -1,5 +1,3 @@
-DIST babeltrace-1.2.3.tar.bz2 995094 BLAKE2B b917002ab3207e3c2763d556f98c190e691d0fe8bd20f6d03e1d2b4477fb374548b04eed591519fb88b15ef3133c847f33b1670cd35fd6a762f12d5fd40c0dd2 SHA512 de231c9e25797d0f3cfb8692fc75b8ce4159d317bb861806955f098a99d5749b627c830111d37788d0da486fdef92c83c020588a6598b4e95bcff6cbf9fce77f
 DIST babeltrace-1.2.4.tar.bz2 995829 BLAKE2B 99b4455000dd403bc86917ce1c5c6f32b7df8754c61197a03cbd3ec28c5756ae858965b81b06ed8cd72b910c2f0e5885c986d229f607f5c9179688cd1ccdd3b5 SHA512 5cfd4572519ec53ad531d333ac5e1df026ebd1a200e0fbec59c892cad5273316e07482a4199a1cb2dcb4994310b04b259748de169c4a7c1ddafd7e185f32c5f9
-EBUILD babeltrace-1.2.3.ebuild 632 BLAKE2B a180e1b22649640e505221d941cc0fe937ccbfac94a1dcb47020c5d0a11f8c2c67e761710fb86e245dea2e24e7c55188b3928f983c5326a358316e5ae259b584 SHA512 048b9d28b257f4c638f1e3b4fed31949ae13f870a1a1a66c2cd0c9dba3a9281dca39566eaa1b70ccfe2281629c6cce4f9126653736a9dc8fcb9b3f92cdaafb9c
 EBUILD babeltrace-1.2.4.ebuild 637 BLAKE2B 58ef3884ce951b847ce00831c4019aec1889522fc54350c62001bef139242e20605f91661037519e066cf2fc4b2fe6bb9213a6ef689ab48ca75a8b8c936f458a SHA512 88e0070a899bf9461ef0db44455b676d33381509a96a991624fe2c1774eeb86af12995db6451b1728d04a9dd0f0765bb1f07ed8aa9a79b3bb40dd3201187f034
 MISC metadata.xml 463 BLAKE2B 72758379b046978592bcebdc6d11a07aae6b14e052bf00fd3f40a45dc2858e59305d39fb1bbfba81ea3abdbf1dc81ce08bc6c57d7efa0bce77db322c55744a0a SHA512 385f56632473bd068e1a2b1aa15190eafe5cc25fc5fda59f91bd35355dbc549f7937d4a3f5fbd82c2009385b2c5113a93aa3954a18fefb4d9fbae933cfb52fd3
diff --git a/dev-util/babeltrace/babeltrace-1.2.3.ebuild b/dev-util/babeltrace/babeltrace-1.2.3.ebuild
deleted file mode 100644
index 500ffadaaa0c..000000000000
--- a/dev-util/babeltrace/babeltrace-1.2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils ltprune
-
-DESCRIPTION="A command-line tool and library to read and convert trace files"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/popt
-	sys-apps/util-linux
-	"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	"
-src_configure() {
-	econf $(use_enable test glibtest)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 052353595534..89ab26d90cd0 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -13,6 +13,7 @@ AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551cce
 AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
 AUX cmake-3.17.4-uv-check-return.patch 1460 BLAKE2B 1cc26575dc1ad8ff9adea7ecf7f5ba0f4b2e16510c2ef3572baaf4f6bf771d6b4a1018000b78310b246e333c95e857851a40643609d997f2283486eddda8e8f3 SHA512 e79c6b34d433804f549b60a926bbbffaeba8506430225e284187905d7df5f522c29b8507bdb334cf30ce88414d326ee4476782731f36f1b1a48f64f9fa208aef
 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.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 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
@@ -30,5 +31,5 @@ EBUILD cmake-3.17.4-r1.ebuild 6136 BLAKE2B 255ddfbb74512dbbbbf5ad397bbf6f78b9185
 EBUILD cmake-3.18.4.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
 EBUILD cmake-3.18.5.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
 EBUILD cmake-3.19.0.ebuild 6182 BLAKE2B baf789644fe5a895f2659aff3e0820ca512b003e21c69a471ec7a98ed3609ebdc32985487607c636400a7890c9edb1d1215d1cb4043ab5713b7c5cee2e9221a6 SHA512 5dbd0c14bb478245ce0e84a5d672ac9ccaa31f4f879791dca998e67a703661f658238e279dbe1ef4b3faa7ffc2b078b8397f79f146c1b41553aea2a2428fa905
-EBUILD cmake-3.19.1.ebuild 6182 BLAKE2B baf789644fe5a895f2659aff3e0820ca512b003e21c69a471ec7a98ed3609ebdc32985487607c636400a7890c9edb1d1215d1cb4043ab5713b7c5cee2e9221a6 SHA512 5dbd0c14bb478245ce0e84a5d672ac9ccaa31f4f879791dca998e67a703661f658238e279dbe1ef4b3faa7ffc2b078b8397f79f146c1b41553aea2a2428fa905
+EBUILD cmake-3.19.1.ebuild 6342 BLAKE2B b9710a55e3a16ab80335f7fa44fb3b75becced5f8db1b1a1607abdf003e200dd3081a0c7b110916877f582879638e8535b2ab1ec9dcf9c1d0478d9db010aa768 SHA512 51f453ceb2728064a02ea16e99de8d2213dff0c833bf1fc4757b87c4dae711b0608c30978c5b8a0176691afb4b80367c2779f9738828d2a8198f0079ed08b6af
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.19.1.ebuild b/dev-util/cmake/cmake-3.19.1.ebuild
index 5dc94575a14f..09d448bde370 100644
--- a/dev-util/cmake/cmake-3.19.1.ebuild
+++ b/dev-util/cmake/cmake-3.19.1.ebuild
@@ -54,8 +54,7 @@ PATCHES=(
 	# prefix
 	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
 	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	# Next patch requires new work from prefix people
-	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
 
 	# handle gentoo packaging in find modules
 	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
@@ -134,6 +133,10 @@ src_prepare() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
 			Source/cmGlobalXCodeGenerator.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-C{,XX}.cmake || die
 	fi
 
 	# Add gcc libs to the default link paths
diff --git a/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch b/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch
new file mode 100644
index 000000000000..0f0a6b681bc7
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch
@@ -0,0 +1,14 @@
+grobian@gentoo.org: fix compilation on macOS using GCC
+
+compiler says it all: include memory if you use unique_ptr
+
+--- a/Source/cmMachO.h.orig	2020-11-24 14:50:26.000000000 +0100
++++ b/Source/cmMachO.h	2020-11-28 16:05:11.509620124 +0100
+@@ -6,6 +6,7 @@
+ 
+ #include <iosfwd>
+ #include <string>
++#include <memory>
+ 
+ #if !defined(CMAKE_USE_MACH_PARSER)
+ #  error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled."
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
index c94ec788db88..4eb611612624 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,3 +1,3 @@
 DIST CUnit-2.1-3.tar.bz2 514500 BLAKE2B 919ff3345c06de44662deb3c43700dc14f3c6b0b1557e162f1f527b782874082bc866b3bbc3fd18869b975d7a0a6b4730eab87ed36847249ff8fa5cbede27797 SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
-EBUILD cunit-2.1_p3.ebuild 1341 BLAKE2B cdeb9574ee641279dbb07cb0dd8f3ccfa56e38e7d9fbd14c1efa6fa9e0f48091caa94c1c1bdd90f82d2cfbc574b1c88d6573de950657d8f52c0303c41e9aeabe SHA512 6b6fcc6d66df4d610ddaafa54f8b046dc83596daa6b83d1c998ddb621b6fdaae222190961a065ffe7172e6f3a4baae0c707428c480bc4b2e67b3cfce4dfc9a81
+EBUILD cunit-2.1_p3.ebuild 1352 BLAKE2B 665636d0ba3dd8e73cf87b8e880c480ded68fe13104c0bbc3f5e98f4e356c997603bd8dd902392c2aa3292563893637f0d3b5bfa2b373e69efde06d62c8c11db SHA512 a1d42fe6269fe66954f013147fb115a65fbf9e27d2ea86834a208546d59f8298cf848efb9fa7a8e0a70dd68d4da94335f65880ddf0b069efe3a2b30fe27337ef
 MISC metadata.xml 242 BLAKE2B c9bc0f1e188dab4f0b4f1027441888c15919ad52adb639905a71471645438c94957a45ec043038fc19a829a6ec6b236eeb026560728dc231e5aeb484a467177a SHA512 3171a680f18023cbeeb73331a33942ddf076e0b8abc2c40284e4a4cb1803ad7264f8e38ffaf182d1f38ba28ad60e65a0ddf96c66a60e0f9a935aa941c49df87d
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index 3ec7a05ec075..240c4c062af8 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cunit/${MY_P}.tar.bz2"
 
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ncurses static-libs"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 62b64b38c129..9b95c085daed 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -2,5 +2,5 @@ AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d89036
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
 DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831
 EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B 7ac58a5fc22f86c48162d3ef0c5f5471031a36294d8e9a68c1bc6643db4bcabb51e0ad581115e18df0e97c1b119d9c0b65737c617f6cdd3dbb984c7c90e81fd5 SHA512 09ee0891f66b52b89f6f45e909c579408cb36f0e8e535636444ab82424cb1c93f89d9cebf48c141f8bd9322c362e3948a5bc6cc3d0e844d1d8d8cb758f129870
-EBUILD desktop-file-utils-0.26.ebuild 1168 BLAKE2B c08a06d6431c05bc1372593d4d1e4ecdfbb55febd338a60904fb21682534118183e31338f1be5425cff31aeced160c4551f4bc4e9874abe77da3a1e2cb370c05 SHA512 81cd3af901129f6e1f78f2fa140244e8e684e65230954a7871ef195f845eaceb4ad5a977a755a092f45c3b29c1b017113b44ae1a8c949fee63964072207ae861
+EBUILD desktop-file-utils-0.26-r1.ebuild 1168 BLAKE2B 51abe19eaf1f632475faa8358425dbe45a72d921d87b299ec32c9012eca4526a8bca8d8d50fcc101d32d7b7001d0a47bd293107e14a57568f28cdeda95998f32 SHA512 90ba5e353c9e1e5bd9caa31c2b4c1c02e7459880543d09c235c51fb0a8f395630d48175211276616181f5edb6f987e46e2554315cd60693c179a7a86cb710c2a
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
similarity index 93%
rename from dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild
rename to dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
index c25251a74beb..52a6baaa91b2 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
@@ -13,12 +13,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
-RDEPEND=">=dev-libs/glib-2.12:2
-	emacs? ( >=app-editors/emacs-23.1:* )"
+RDEPEND=">=dev-libs/glib-2.12:2"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index eda68538c90b..8ff37f04562c 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,3 @@
-DIST diffoscope-161.tar.gz 1564306 BLAKE2B 2e07cd91061f9556e9838a96424c8066216384644eca578f305d9b947fa5dd689ad90d5b46f1c709fc2b639ca7f317ae0812252be23571cc857b66e97ea98627 SHA512 8da2134514c7570bb8e60ebbd5cbe6a7f5c0a5b29cac7b41588d9bc823b1a07b8fe8d5006364b75e34f5dbdc75352cf4322a8f9c3370257b60a962b12391c307
 DIST diffoscope-162.tar.gz 1564386 BLAKE2B e5ea37ae48c65dae3c850a04152c322e1e8535ad982107689f23a4111ec04b9b7766681b7e61f69c75bece271d8875ef2d109b315ec5d55ad77658a065148ed6 SHA512 a5de428b491adfadc432322eba524dc8031a6be9709887f2f290376bb94b358cec45a4a0a31b8fb5f25377a33752044882245a22d7f2b71b17d5efe002c850f4
-EBUILD diffoscope-161.ebuild 2161 BLAKE2B fb5e4e91fc32b56175d45b589cd3c11bdb42b5b1c33910843d489ea311d4eade3860c777a94398908fe2c94a0bf8a15b91df62b4f7ce7dfb43b76ad452bc8184 SHA512 4713e398d39141876170b6864e497321743b868eaf62f181dcb8341f95a012f72c46db35c51ff08ff375b1439efc2b411f61e36b50950aecac333af0d0df377c
 EBUILD diffoscope-162.ebuild 2161 BLAKE2B fb5e4e91fc32b56175d45b589cd3c11bdb42b5b1c33910843d489ea311d4eade3860c777a94398908fe2c94a0bf8a15b91df62b4f7ce7dfb43b76ad452bc8184 SHA512 4713e398d39141876170b6864e497321743b868eaf62f181dcb8341f95a012f72c46db35c51ff08ff375b1439efc2b411f61e36b50950aecac333af0d0df377c
 MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
diff --git a/dev-util/diffoscope/diffoscope-161.ebuild b/dev-util/diffoscope/diffoscope-161.ebuild
deleted file mode 100644
index 572dad5645e4..000000000000
--- a/dev-util/diffoscope/diffoscope-161.ebuild
+++ /dev/null
@@ -1,71 +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="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 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-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 )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	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 )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )
-	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"
diff --git a/dev-util/dropwatch/Manifest b/dev-util/dropwatch/Manifest
index 775ecd77226e..f9319673f681 100644
--- a/dev-util/dropwatch/Manifest
+++ b/dev-util/dropwatch/Manifest
@@ -1,8 +1,6 @@
 AUX dropwatch-1.4-binutils-2.23.patch 1767 BLAKE2B 2d5a39985393e61daa1a197edae420391d6d56b2a9cda8a46b2bdb6d5d0289933961837489fa7da66b2920a984bc0f36d4c33764ee5c2f3f60258d4907e1d87a SHA512 678749e2f37c9e8c5613a884919e0ebf9039850f5fa9a62829d66783e703f6aa3c69a2d040b37f4657d2c43edf46d4792d9d87270a4fe4b590bcc36114470b45
 AUX dropwatch-1.4-makefile.patch 639 BLAKE2B ee87268a51705bfed07eae5bcf4a75972d35f7f0075919279c916f2eb502d31b437bf0cbe0fb4587605cadca12d8bf55a8d14ca49bd177ab5344a6a649bf0516 SHA512 cf9756fe238041d5a9a764e81f5294832146905a809fccff999cf45d28015fc70ac0239b57b2e7d994095d5b45b484ea2b14e36210cc10bc1e4ef8ad3d9031f5
 AUX dropwatch-1.4_p20150706-makefile.patch 563 BLAKE2B db75ff88089272f9f0603b4e6ffdbe669e312188c03eba712fcd01152f1cb00bf2b17a720c0dc7137d95158db83b10c7a8f1bb2ba3a647cfd469abb778b1445c SHA512 763781d0a3718978c2fb98ad42183633f6e93c122739bd4b3020698674b4c3c35592337be5f7a3c839ab3bc4599cd10a85a19f1d19bd9635961fcc08c78f0b01
-DIST dropwatch-1.4.tbz2 32199 BLAKE2B 2f6a053ed2fc1280ba5aacef79b6b43903eb115ab0b81ed6dbdd7d789dccd5dcfc7d42a76718c73b3c6cc8013ef9a8a1a0e00be83ee2944ad2f101d0193f3a3f SHA512 a5744ea156464c53d31d5b54bcaf9bd61f2035285059bc05a3eec20be71d1451a6191237f194dc5d8e6fb6fcbb81d9ef87adf5ac2d878cc1f159191c47118e29
 DIST dropwatch-1.4_p20150706.tar.xz 14880 BLAKE2B 4df44a517447a7e99fe5d84a79421c9810c3b67524eb1d208c36ebb503dd43c715e57c678c33a90689707680d1f42b9d30d00080894f22889553e551a23adfa6 SHA512 f78f19f063408cb655869e662e92709b1cec820ab35b11272b87a990c380e0799c6e9067dcf53edab795916347dfe3fd04932f9699c3f5649f96d62567957fbd
-EBUILD dropwatch-1.4-r1.ebuild 920 BLAKE2B eddf223a1aa87b162f3121aeca2c192464205da609fed9c8261128cc194f0e4a72369c32694fadd36316a897cce87cc6f2983cc82f31ba8429c8205c25ab92b8 SHA512 6a5cdadcd68ba947df0a97ad46ce2df53b2def1137064b8153bd0d900fc0e92db4c17a08a7c3ab2eddd69e7245d7ce18912cb586132c2d5ea86ee0db9ff48157
 EBUILD dropwatch-1.4_p20150706.ebuild 867 BLAKE2B 86dd6191da4827c62a18db05a01f3163bf6c6af8df1574ee0783d3969e87bfedda4376450e6a465181cc0afd3b547c302f5596259b1ea81585dd93d3167fd969 SHA512 466bef588bc88d7b02439386b3d4e6659922369f05eb1cba5eada751b1271b813723ba5382ddcc6903c9fa3491f1d1d33a74568a7dd087808d0ec81a489c4e81
 MISC metadata.xml 250 BLAKE2B 2ea879960a826fa9be35ec3a0988634da4268c54a8f4a484936356f1fac9e100b779dd43d7a3a684f121e5de5bae7195991e4d378d36b18f97155208fae728d0 SHA512 a5334e41fb3acb7a8cce473ca9616ecea8fe484e870173f0a26042cd8aca0bc7fa4fe52e9cf10b7495c44608e15f1c71564b3f92a44611ba830b08785666b2ac
diff --git a/dev-util/dropwatch/dropwatch-1.4-r1.ebuild b/dev-util/dropwatch/dropwatch-1.4-r1.ebuild
deleted file mode 100644
index 341fd711b330..000000000000
--- a/dev-util/dropwatch/dropwatch-1.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="A utility to interface to the kernel to monitor for dropped network packets"
-HOMEPAGE="https://fedorahosted.org/dropwatch/"
-SRC_URI="https://fedorahosted.org/releases/d/r/dropwatch/${P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/libnl:3
-	sys-libs/binutils-libs
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~NET_DROP_MONITOR"
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${P}-binutils-2.23.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" -C src
-}
-
-src_install() {
-	dobin "src/${PN}"
-	doman "doc/${PN}.1"
-	dodoc README
-}
-
-pkg_postinst() {
-	einfo "Ensure that 'drop_monitor' kernel module is loaded before running ${PN}"
-}
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
index 323de54c1c4e..3c405cc4d5fb 100644
--- a/dev-util/kyua/Manifest
+++ b/dev-util/kyua/Manifest
@@ -1,3 +1,3 @@
 DIST kyua-0.13.tar.gz 663776 BLAKE2B 5bb6b2a7723567395baeace0b70085a631856ac98ddb304bb5300f26bc89a1a1add589486cd08f1569ca9c7534fd5071a62cdcbb519a10d59221df63c0aef932 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae
-EBUILD kyua-0.13-r2.ebuild 620 BLAKE2B 339aab18bc74a0c572fc0e2fbfd2dbfe15d27151fcccfdbe243db2060ca36a691ea8d8e256bb940db2b3b4a31c9f28944d99d721cf7bcd7eaba90fb28f01f7ba SHA512 e5518a5c1d11a899c10f2a0b971d528699a9d91b6b65e6dd41fa56a433c6a688a1765d5fdc8049d7866126fe8e7888b5034b56458773c28d868daf125fc033c0
+EBUILD kyua-0.13-r2.ebuild 631 BLAKE2B 4f005cc7994dc60a276ecbe565ef80ccd580a7ec6bc7bfedc39144ea2d62f9d6ca0053e0a3e829a7ec28c3a692f22550080a62c1abb9ff3d237b989f24497ed0 SHA512 8ae51464ec04671bc2c121869bd1df72b0b6e8efc1966fecff2f60f3688a3ae822e883cb6620949f43abbf7827cb4685d98c8b643d834c423b43eb0fdcf8a8ea
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-util/kyua/kyua-0.13-r2.ebuild b/dev-util/kyua/kyua-0.13-r2.ebuild
index 55e06fa0e6d5..21bd972f1b1f 100644
--- a/dev-util/kyua/kyua-0.13-r2.ebuild
+++ b/dev-util/kyua/kyua-0.13-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="test"
 
 # Tests fail
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index ffd2c374f1de..5b06216fa9c0 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lldb-10.0.0.ebuild 2477 BLAKE2B 21be1f15644d0c00a5c9fb21d0874b2784116b16a36190947b1df9d4a962a9cefae2e386c741b91b3e60709e1cb8fa8d8327f38c310198641a0c91aaecda9d0b SHA512 61bff2bfcdb91f14c8a4f70b59136df0b39fbdc86aa43e090f116e11e8e03ff0af15d3ca0b0ae7dfd516207e3457b670f08c1cf4198ecd979c5e1c2b4f7fb117
 EBUILD lldb-10.0.1.ebuild 2335 BLAKE2B 1e8212cd840aa2898451bca1c2670f443707738b4c8ca9c673f9e940fa918d0f742b04273f9d2899791aebb2db499bf210605f9ed90479029d4c25add49a310c SHA512 86f5ded28593601e21abf270a0dd0ff703c1ef863534cae87ec72f67ddf8de4fc3394b7088be9d38dfb39a79c1593a57b3df4f5a167e96e6aa1a34c2b1c8f656
-EBUILD lldb-11.0.0.9999.ebuild 2375 BLAKE2B 1be4c3300661c9b6adcc94c7b47954506de3ceda677f0c7df84a4a98f46a61338bdbe9d21688cff76abc3d07f23ef83f1e62c943e999b3b955f70be81ae1d862 SHA512 47d27d3edc618f93850199aaf89cbd081f2346ba6b9a370571901994f66519f780babe6e63f189b8b6a3153c311866527777256100599379d81a277456c64d45
+EBUILD lldb-11.0.0.9999.ebuild 2377 BLAKE2B 24e812157bf567f7fe15f3cfd87be257d497f3718344d811289268e8dbc88a3fef3f5c93fb40b05b3f7d2c967e7eb8c995d558c5d735ffc770c2d2ae20a35c99 SHA512 84be51f4c642347a8d9210aab04c5de8c990c8cd413fc575aa3a8d4eadf8b83ea5c0f3df41d60b41deab20b1cde465ee9262a17e7f6cf9eca44f20210dc17c5f
 EBUILD lldb-11.0.0.ebuild 2383 BLAKE2B 86df01e0663b79c93b5816c6cbf4ec9a995cded9350d100bbdbad9b9ab7529fedf0244274718a919a003209ad0c48580192a06aeb19f3ca4c06bea0c9d35f9b7 SHA512 ddc49fda9558b794f08ed9c3b0f91ea3fffc67ab171354a7f229790a7b2f05d0b144da8bbc686571a5f9dc1f0fbf5fc502bf99ec3f8897d4537b0ba9ad69a7e4
-EBUILD lldb-12.0.0.9999.ebuild 2364 BLAKE2B 8675e540428b1f3618cb35e1ae3a624c9c1f1d0c65177921c0cd2c77013732b8f7b933241e3984ca764ae87799126eb420b89dc34ba028745cef42a645a53afb SHA512 a3742b37d65b30e9fea09dc3a80e2e944fbd642364842c9f9bc8f665549bad8ac30afb3c678d1346b836f9f90b794c213d4fde59907df95a79b32f23419d4b51
+EBUILD lldb-12.0.0.9999.ebuild 2366 BLAKE2B 4dc3eb12f0168e7915b6baaee930a79ff514e2ea900562c3ed46c01e6d115bd7bfeff34ae1f65e46fc8b6d142b7de63b848b38d35f0306c185793ead33cdf752 SHA512 61b66d649f28a0dea7805ebec036ea6c805c76d4bc9cf8c9ba778cdd6f7568c6c3d5c803f6510374fbb2f483c24056e6bd0a01b338bed30cab9f98d39d260622
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.0.ebuild b/dev-util/lldb/lldb-10.0.0.ebuild
deleted file mode 100644
index 950cb52a4b4f..000000000000
--- a/dev-util/lldb/lldb-10.0.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="libedit lzma ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
-		")
-		sys-devel/lld )
-	${PYTHON_DEPS}"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_COMPILER="$(type -P clang)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index f16add65dbfc..e3f6cc1ae822 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -40,9 +37,14 @@ BDEPEND="
 		$(python_gen_cond_dep "
 			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
 		")
-		sys-devel/lld )
+		sys-devel/lld
+	)
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/dev-util/lldb/lldb-12.0.0.9999.ebuild b/dev-util/lldb/lldb-12.0.0.9999.ebuild
index 9e83aa0a2497..bcf3d783cb74 100644
--- a/dev-util/lldb/lldb-12.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.0.9999.ebuild
@@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -40,9 +37,14 @@ BDEPEND="
 		$(python_gen_cond_dep "
 			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
 		")
-		sys-devel/lld )
+		sys-devel/lld
+	)
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/dev-util/peg/Manifest b/dev-util/peg/Manifest
index 646d86969700..a1f7084e5a87 100644
--- a/dev-util/peg/Manifest
+++ b/dev-util/peg/Manifest
@@ -1,5 +1,3 @@
-DIST peg-0.1.15.tar.gz 56522 BLAKE2B cfc13761d4f3de3e4906abefc04fb732e7f30e0a1eb70dcab79de6001434866329cb4263fba68a5c8aac9dd895805d0de43dafa5a9e382c4c2e12fe90189676e SHA512 70b67d57c866c24cc9ceaf029e95bacba56def7ccb289233e3816c1f6f1f210dd8a729446df94d0424b5946959dbf9a33f81a5a95f7563a9dca460d6e2320018
 DIST peg-0.1.18.tar.gz 57776 BLAKE2B 3266db2009073ee95a7fe65f3969b06001669dca095a8b77cbef3293557f9919872b44b348ff3de53cf8a132fd414c265bf0da3f77f0da0391d6d53cf4ab9217 SHA512 ca2fb9088bf87955adf6f883370ddb7d5f6f3cae3605a871094317205a124cce4f7b9f83cf4662cb470e2c5a6977608b456eb1fad98022d7e40fc384d1fec0f8
-EBUILD peg-0.1.15-r1.ebuild 896 BLAKE2B e286cf9cd51c9e14563528a27635b4fe4f0779aade712d782a2017f36de303866c0026a0f629e4bfa8185a640165938c0948f1406af94a9a60bf3a546f3d0a9b SHA512 21b10c4f565e3dd927f08e3e4a1aa70cdd572ce8777e74dc069dd830d813abb5080127d2789e91e86d5048217c94663090a4c548ad5efeab595f34200fabcaed
 EBUILD peg-0.1.18.ebuild 870 BLAKE2B 85683a921523c9b1c83d40f97da4d7b6cff4e152c87025f0bff948c751f3e5003436d5ce783ca636f3688178cfdcfc889642f56744f2f131d886ef17bb9e33fb SHA512 ef827b7ad368c5d0bce2de6731443366b47d6154ef0267581e668f5389940c84075b9a3f5e4da6b758694288a7a8631a841c206155ff8f94f47e7cab872fd2cc
 MISC metadata.xml 257 BLAKE2B c4675d1acb1e5dd4987811e68c4e4b23d7476dc5d5a1c90aea425f43e9f92261fea544c0fe3bb2907b43a47db5a340abce8b8b0e9b777e79a9811a7d5d96dc9f SHA512 7c68096d12fdee234074ad1256cb5075513b3a00795138a18a70003d8498c9418664d4f62772647e090796ea6b9bda9aeeac1e74c271773efa42568aeefde301
diff --git a/dev-util/peg/peg-0.1.15-r1.ebuild b/dev-util/peg/peg-0.1.15-r1.ebuild
deleted file mode 100644
index f9bd88d83f92..000000000000
--- a/dev-util/peg/peg-0.1.15-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CC) $(CFLAGS) -o/$(CC) $(CFLAGS) $(LDFLAGS) -o/g' \
-			Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dodir "/usr/bin"
-	emake -j1 \
-		ROOT="${D}" \
-		PREFIX="/usr" \
-		install
-	rm -rf "${D}/usr/man" || die "rm failed"
-	doman src/${PN}.1
-}
-
-src_test() {
-	emake check
-	emake test
-}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index e65568787f7e..f75ab4121eed 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
-EBUILD pkgcheck-0.7.7.ebuild 1403 BLAKE2B 43f5471e3c5742aa2eb7468139d857bcd71c094e0504277d92a9146fef10d292a3d0cb744b042825315505aecad1962ea8f836581925f0c0574a9f0cc56a0b8a SHA512 29dda9f89452c61f521336f3d25c87c0d69594d3628fd5f6272859bcd67c253c5d4497a927b47a933d2961df2deea8fe898fae93fd2cd87148bb97d5335f4486
+EBUILD pkgcheck-0.7.7.ebuild 1414 BLAKE2B 01638e4375ff92e362b168ffae6c79b3f736232701e0b391458eea12060d8445190781f7d81bf0db6506f7d4cc7ee2f64276184d01cab4eeda2c26ccb0c8a981 SHA512 fd0c558a38cac10ed4c8a9ebd63df097d48d41bac5f52a7aa94d9e48685cc1c0f9d76922f1cc2bc386824ca182131c6957c4aac4d98882e32700e101412e1908
 EBUILD pkgcheck-9999.ebuild 1411 BLAKE2B f5f24d58e52919909b9b3fe9ef9f83d9a87e0cf86e5793b0cc5cbfb48236405f440f3fd2ec90dbf6100c24a77636a7af74b10cd7bea2a0547f4a823757acaab6 SHA512 9eb21a1fb70ddb97c087391785d168c567fc5be55eda21abb9c2573318e990cc28e93ab16710e64ba40051bb3a7cbe791d8a6acf5586aa0193d7bdc1370f0270
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
index 057a5bafc42b..3c1b4083146f 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 6ff0a4ca808d..34037771f104 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,5 +1,4 @@
 AUX rebar-erlang23.diff 602 BLAKE2B 761b7e35408487698b27b0169989937305e9c7db14b49f5cbd411f4cfe19525a82e50d3c105f38d1fedc75f4c51d264fbf4a4a496b9bbce826b994241073fea3 SHA512 5f57f199dcd5544dec48119feeb288c2d6f5f0a45307b09489a37702609f6e79db08982764bd07f898c7858d45d8c154e314fab131b70996c95a1473561ba8c4
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
 EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
-EBUILD rebar-2.6.4.ebuild 624 BLAKE2B d634bc46b48270d5c5a4b1c2d3680102d61a469ed8d904faea392a257c161295a2175a26afffaf367b3b2feba3b5268805af142f9cb685a29d6b6945c22ad983 SHA512 08a934a6d39eb91cba297036d22f40f0b6024e05c46630a4096f58cbee55928aeabee71ed0cb3c46a7db0791b7d62ddc6f6306a06756d00987439b0f7b7c4914
 MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
diff --git a/dev-util/rebar/rebar-2.6.4.ebuild b/dev-util/rebar/rebar-2.6.4.ebuild
deleted file mode 100644
index 67ce5a03f8de..000000000000
--- a/dev-util/rebar/rebar-2.6.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/rebar/rebar"
-SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang:="
-DEPEND="${RDEPEND}"
-
-src_test() {
-	emake xref
-}
-
-src_install() {
-	dobin rebar
-	dodoc rebar.config.sample THANKS
-	dobashcomp priv/shell-completion/bash/${PN}
-}
diff --git a/dev-util/rustup/Manifest b/dev-util/rustup/Manifest
index aa8ea6f78072..72912632afe0 100644
--- a/dev-util/rustup/Manifest
+++ b/dev-util/rustup/Manifest
@@ -1,156 +1,263 @@
 AUX symlink_rustup.sh 2581 BLAKE2B 3bb410b287db19e3876236b811d97ffcfc959e11ed5686940aef19272fa6493c24a48b1e4c4c28559ec6f072c4c2514e193241b74b54050dac3b6e21bbe7ba85 SHA512 fe1336549dfa8978d805f6a76cb734ec88b7d06647c9e80ea6b5fba9c8906868c5aebcfaaf52df17d959d8e44451e6449b8a960f0cdcc699e4d07760b91fcadd
 DIST addr2line-0.12.2.crate 119767 BLAKE2B 5d012c7c0a0d8afd48f2148b5fb4ceb54f525ef1ae6e4f9c0ad228cff059b2e0662aabb82eead22db6ea284b5c430c8b8cc2aa0100a46d8d14009bd88b5fe24a SHA512 2c797f587498418c3c14d8ffc7eb79092532dfbb290b5371594e8dbd82a0979929ecb0b6f2cb615d0481a555cb1508b4220acb2db8076ea64fee0d47f290de6d
+DIST addr2line-0.13.0.crate 29996 BLAKE2B 09eeded63eefb326ea111f80a228f60ae45e4dd1a0fa0fc8a74ab31f04aebd9cd66cdfad9ecf85b15c702f1b33e5a586fee95097d9a575ce52299069914c7fb3 SHA512 c796f763aa0ac9ae04b31beb813521d3743752d91235eb3ece1c205aa67874c1b66f1f4f473f1815144d8d94851691d285845a1d438990f81b61f5960cd67cd5
+DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
 DIST adler32-1.1.0.crate 5442 BLAKE2B 1a4d932402a584fa6edda414c0dedff4994afcee7bfc71f85f6e8b4568de835bb7a3eebad1b5ac0be7f59cdb0e5ce5dfa4444d2c59d5ecf819d2a6abbbd7ea37 SHA512 57e3b3812e2747470c63edf64e13827c96ef8dd2311833b7f616ec63cf57ce8967636ec4d57464b607f570df06f6f648214d12ddc567e761b2de2ab16c8a7271
 DIST aes-0.3.2.crate 84345 BLAKE2B e3e634fd6256bc52a8d0be5042dcc74651e1197eac17592378b9e78ea173eb02f8680b1408d860b3c278bc4eb22d714cc83788a321b4f88d272495811327788a SHA512 0dde257064659ae0d7b13d12e538f2cf2f35d2f3cac2f3e0cf3a2dba0a4a89bb78377e85382cf82b95e347f34ae3c27bb145441d50f20e595c069445560a9e04
+DIST aes-0.5.0.crate 87133 BLAKE2B eae0f752199900c274afb47bd700167d9185201a5341e6bdcc014fb70b51bf304ba7cff3a69c9d35484220c2e91ff879edc579da2532dfa81fe6874bec61b037 SHA512 e0ac02f3e0b3b5279f741e0ad391c2a4440d3570ccf732d69db1257ee4a841914db6fce0c889b1d8a8bcd067715549ecc01efe3156fcc1141fde9413a7be4f38
 DIST aes-soft-0.3.3.crate 92804 BLAKE2B f97f9c8eaa2dabf99f410c821cd1af2a000dccde691bc9479d1ab1a43a87282e82cf8e2f9fa35c7a175dbc8a66464c196bb8fc762999b74e75a69e838005b333 SHA512 9c56f05d2e36da6e51e504eb9ef5de1ddb398cfe8ce025af0732794a62128613f2224a0e729b75b9a98a9d633e29eb1b23c67078769f33bb052e5abf0ce25a85
+DIST aes-soft-0.5.0.crate 94026 BLAKE2B d6f2ac7233be9931b4e262d0a341e443e8ab720647643add0de8936aa6ba6f836ff86c8ce8512a0d55fdf8d804204fba1ece39a163a60541507bd18e00a8a652 SHA512 14303f08394119f25a9d3460e5e6cce8277d4e6871bd83b2abf17fa26c62e6abba8b47ede1633aaacaee3616d793725b6b3cb18a606e8490e4c8ab28d91d5248
 DIST aesni-0.6.0.crate 100722 BLAKE2B 80c11882a77b0fe2298d37b87eb07f7c9f90bccb25409215f2d5b5a11d63a27308b0051ed6b4dfa04f0101579ea17b9d1f71f74ff4dbb8555d00d22941175d70 SHA512 f059f03d5ce2d98f0fc14dd3ab65ff87d748f80ac29f54d8674be56ca8df0650dc70e75b8496a2471d106830df59ae6a3662c1871bd918fe7cdf5a3726423107
+DIST aesni-0.8.0.crate 101630 BLAKE2B b20c3df90d881b87e18edb295a5ed210faa60c45f07d9f9cc156084f501f3ea89e2dc919f404e70b85d1f828d3a83b79b7e0ebccbdc32727f7b66e0e0387519d SHA512 205f572b5afccb5460d0a268305d7dada10935e297b9e9dda4651cc809f6b94f2817ac6d866fa17e0db93b32c7f3c4bf7a5b34d48d5b45c028116123ccf32d84
 DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f SHA512 9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6
+DIST aho-corasick-0.7.14.crate 113042 BLAKE2B 6ba517169dd0bfafe7dd7755e2f664d831a17c6a367f29cb54d22b8b61eb04c75b67dead9a7855bdeaa1afd8aa5049b7580617bebf0cdac61c0712eb3525db4e SHA512 0a11e7bd2d3b6868fb6f64b61f3feead4ea57ab3c5d75c6586b68765425219e631bf875e43f73e79888e71079b3d7e10af36af6f96b72515105df79f5922f296
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST anyhow-1.0.33.crate 28540 BLAKE2B c1085112992f4bf1b12640dc981a438ce55ead73c8031bfb38ae770e1c3df90acdde3b170a787354e1296f6471b9e491286286a6bb4bebfb32b2bf3180bc81b9 SHA512 b19355e2b484fed8e83132f646335db93e0b79d1ae19e6476e8477d1ab513f12cb4392c2492da0f66064fd3618d07ca1a17efbc4bbc29a647e9775b7f4e2e2be
 DIST async-compression-0.3.5.crate 39371 BLAKE2B c0e07a8fd56c8e0667729d49e41dec75394c8a355bb897bd080d54fcb4219b451f2c74b5a4d96f53c9b47cb64926d37b0ddabbe54ab96887a967158bbe91656b SHA512 2109ede9122c4005f1431103eb757f8827d26beecd7fb8be2e0d321e8fce273026afd462f8f10ef2058ed023a46d521861704cdf055f1eebe73680ddd69efd6a
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST backtrace-0.3.49.crate 69810 BLAKE2B 80bbc97714803859274f8d514209648cbb87d2ff29e317ea3a4b2e0d5184cc900e3e5317235409a16e3b6fcdf764c9aed42d77717f27643131c83cfced554357 SHA512 e85c3dde0b944f2c59909dc33902f20672a0bd1b8c6c941254af89be7573f3641a7352dbeca90bce89a2f9cf4242d78caceeeb889d3ee8857fd59a42889f2913
+DIST backtrace-0.3.53.crate 71892 BLAKE2B 58df8a8954ac04c2aac2ba0d2a7b4bc54943fce911c195fafcd6b6a0fe2086db2a5f976de149c8be7e741761b6a5a9661fb96330b17db6e1981173acd8986ab3 SHA512 91c43e3778146e66bd0fbbf97e743a4f95293b1aac96e99e1b66e8ca1c5f314dd89eb892b27fe2721f95b3ffb4e4f19c07bce96e50d6328cb6a3d962eae06673
 DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
 DIST bitfield-0.13.2.crate 16479 BLAKE2B c34f150e135579452d5b6e13bac0fb4a3a897219660289c861646330f7050d19a10d041affe8d250bf314c35eb19ee519b1fa0dd12eed94a93a5e904b95380d9 SHA512 5ed9ad97913828d67b19d5f10a264592f4c03aba8e4ea791f7a20e61da79066daa1d5ce678c822d8f6f1d065a65a3aa6afec23980abd1da38b44dc6cbb96166f
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
+DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
+DIST block-cipher-0.8.0.crate 9205 BLAKE2B 9ed78118472bf015961f1748ef80ad87857a0cbb21780d040297559124bb039a7ada657870163e4e6b426c8d07214835e39af16bac9e9dd754ec77d0ee052a82 SHA512 a6ded60743dea8f557ff38a0969c4f636ba9777e6c10c2503c9625b290166dee69afcb77ca0060c523d9f9239fbf52a7ec71039f15eb09d2cf5b8ce01b580e41
 DIST block-cipher-trait-0.6.2.crate 7539 BLAKE2B 88e8ded059aad3badb2435ae62fa1e7a4186f313c7f9b8cb64db2a7103bd9d15f6329715be29923adce39bc02747508138908b1e24fd1396fc967156d74e7848 SHA512 7287445cb4139939397d7947d4a6b0a57b19085898603cf2cdb9a35935ec0cfc360f3af97f894490b14c96a624322571efb8dd98393c2c355e1510a95e068e49
 DIST block-modes-0.3.3.crate 11088 BLAKE2B 2d0b0caa293c35f07d78d603930f3a20603048fade74cf36a753fa8e5531b9a509a32ab42b36f3bce9a7f05fdf909d19900c9fc2b251c0a339a8d47730a28b82 SHA512 7a24506a559eb9d35b77935c23e4cfd160f988ee71d1c8f8d7c6e7d0b5533ade5d8121ef76bc08786ad7232f2ba50276983a44c8825468c3ff322fedff56b656
+DIST block-modes-0.6.1.crate 13358 BLAKE2B 66b83f4564f621eb740c28f89c2c70c806ead2026979920a9babe33d560da519ae00110f7511c50fd0c43c7368f17f261e3119738bb86507107aa1b1fe86e946 SHA512 89767be214914d80e0454da53af00ecf68a53ad26aa037b3f2c675e6653c8724e355258439b7be26cd3a785bb5c272d1003b54e2b69e167220c5d4b3e20cbd3d
 DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
+DIST block-padding-0.2.1.crate 7672 BLAKE2B 26f682717c908886fc54606950697a01e999c8d725e39cd5ca9148b089d5b32981daf717db21128b551287d5e818363db4c34123a8d8dfa3405f940eb284c01a SHA512 d0bad6ca76cd491446f17c00986aa8caab36a78b4ee4f881a14b316074a96940566ed90460aade765f2e7ce04b359cfe21f6c323200637f50e8b5adf567017af
 DIST blowfish-0.4.0.crate 14781 BLAKE2B 18196691d2cedf4f8bd287114ac7efb172ae3accc666b90392570504d7348694d8a6e5802d47fab103b01c89ac19e0c79e25b1ef1ef618caadb0274b17f2387e SHA512 7f6dc4c3d3695f141074c6709f9bf491e38a45124fbcadc9204e15cca4a3af8628037e35b47aafe306c88c21885f8c8e972f966ca67380cf41282fd90b810e1d
+DIST blowfish-0.6.0.crate 16125 BLAKE2B 580f1af618652ca2bb5d7dfda74f129b5950882f9416c151d4968c50bdad6ebd4560ca1c9786e09a868212a06d32e72ae9d9ba631c697a8e650e40bc1cca4cb0 SHA512 ab617c0764964af9ead0fba9862cb5b250a7fca83695f2644f2f07d6100d6701730cc6f4c5f6ec73380973ce78576ba5bbf285d3ee6525548418df247806cc5e
 DIST buf_redux-0.8.4.crate 26608 BLAKE2B 32698d29b357c625ab663730cbf7717b91200a9f980d3c9107ceb5f8f83ca7f2514b9b5c7fd2b229e8490832dc78291db460fb7fba130cd61cdec8b42c33a483 SHA512 709095a4acadf032143225740343840d247b4dc130968e36447260343294b134af780604eb8214b9e6dce924e13701dcf7a9c7291340c3393a9334c8aaf5454c
 DIST bumpalo-3.4.0.crate 129102 BLAKE2B b585c8d682acf555cbe695dfe150074e4afb1620736f28b29567070e445a12293b460d3c85ff88979abfc74fe7453010ebbcfd64bb2b2d575258d51fab2b1400 SHA512 955e49eeeb803547092b58c086a2582e905578179d93500c1f55dd3fb7a65349f33ddc4c2710c0ee804abbe4e1f2afbdeb998533d362177298a86a4f9a8822a5
 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
+DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
 DIST bytes-0.5.5.crate 46424 BLAKE2B 08cd9bff57f6f546bcc4df72fe9f2ad16a81c89e6141353b687518d2d3a3953b1aad0105a57f0245aad8aef005c2b5be58226f3b22516f0d74744a9f44d3ca88 SHA512 c16c4a3e4c2105a99bc30358b387f6f17de3e45f6a0ce98c3469ef3721bc7bc6732be2db6ac546a54a09f1e7442798296a58108620b67057a3e42e784c5c8351
+DIST bytes-0.5.6.crate 46291 BLAKE2B 6d33ab47d04f2e469db2add31db118f95cad53002be7969738923d62a4fe3605ccbe9fbcae6d8741310c543625e80d9adac7d9e9fed01b71cb3943ddd015d920 SHA512 a1caa1f58754f4d2e54b8df8d0ca0083ee5282f5e4d3bb5b1735022933dd2e66fb3f39c7a82216bf7a7e29591695c2e10c8b7144c83ac598e34193f2425a32cc
 DIST cast5-0.6.0.crate 36532 BLAKE2B 7b0fb6597d74a087dc9c1e5ce854438ecdbf5a407b0ca7589677b5ec61e70921d2fd56dd0d41425eabc87e80660bf8bec5a9ab063cbbd68c4f5fa5b8c2725612 SHA512 409b34331c81204fb18969023db27d68de6c6283f94b7f44e29ee3f7c5ba746a71d2a614845eef7dc169efd7cb43f4e0ab227c64c2634789c16627a55e6b3739
+DIST cast5-0.8.0.crate 38519 BLAKE2B 0e43d05d157945751c1990f2f9d914776b2297510d4f23633d2d8371efe763a02934b7df081da18546a717760b31c1030d1bd550708714ccafb008522c4c30ea SHA512 08e98f176b883c8c5636c418ce9514e5496ab56bd9d4fc84f01342628760ce744bb8aff41f8b69f787290d8f8ed3b755ad23a8ee37eefa225115db589225beca
 DIST cc-1.0.55.crate 52090 BLAKE2B 1ace1ad556b030d3d81dd9af06767acf6e31d00f3eabf5d72a41a537e4e984defdac4ab0d802cbf83dee3f726a9aefd9c87ed702fec08a0cc9ed1e1410544b40 SHA512 a20aa18cfba9ee0d9fa0bbf3117be6d37c4420ef45e1b01f5505b138ffb2b2052c9464f964c5c2881f93fd4c903cb3b78b4c15ed14ea27585351313f189d1725
+DIST cc-1.0.61.crate 53454 BLAKE2B 250a847faed1e7ae0a7d3d0f15511222a8cae499aed1e6736d65234d6915cd64abf0b01df5bcc38ff2800902854ed57b297fea2c63d41a480b02cb07863a7490 SHA512 c238590712c5359040ff9670fb60690d983b1a2aa53ab7031f552b4eb026c9e305f401ade77ee389eff90dbadfed6eb1978f67bfa143589a0e0ccf39edafb5d6
 DIST cfb-mode-0.3.2.crate 8186 BLAKE2B cfcea04c0453340caff3b872b8a89e7074aa9c4bf0ec49ad7f3f4e45b79479e3d684e5591c23237536ec206477ae044f25b9d3c3322e3b48c62899cb245bd6b6 SHA512 8e6a864e876ae28f44d0a53f253fe3ebee3f63e6a21fa9acd19440287d14165f1a15d9b298e3978109d3cc7f5e89e93c54a979b3df8269fbd70bf96a999e60a4
+DIST cfb-mode-0.5.0.crate 9329 BLAKE2B 33e24bcd6d6fef5def320dc5f04ab13ff77961781160743ca9297aa04c41bb6a165ebfcc4a785ca952450e73b32a407064288281868906a39d54e62e91aad81e SHA512 11a7dd3e7f8098d912ff202c77d1479f2138000d319bba2792ae428eccb51fb6f6a096d91f87b855ded200bdf381db49206c8dbfe824171bac9bd4fe371866b3
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
+DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST circular-0.3.0.crate 4571 BLAKE2B 4e40382b5d7df5162993e307c55981c72de69689927c257a40e6f85510c398c897e0f99962e52d466f0d6dcf869ea181cd24ebe459d4a6a32edbe08997f00fd1 SHA512 531ecc0f996188d3479c36c808f66f85e9d9a9ab462ed56a2f957b99c49176e7209067eda679e8497c2fae9421e36447ea4e770905781204172f0d8492a5b22b
 DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clear_on_drop-0.2.4.crate 14416 BLAKE2B d5392d9b361cfd734ae0d4a364c10f70a1f95121df353472696de4d907f3ae98fc7d12eeba0d8096178988dbf3bc5484f5e655c403252d10003a5c1492dcab1f SHA512 45d33bcdcc5cbaca852b626f9e6af1b63e019a56d7b299b92c429504075ae4dc279e686085eb7bea243857bcc98114b4fa05c91dd6128250528863d114554a0c
+DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
 DIST core-foundation-0.7.1.crate 25853 BLAKE2B 9d0ea528a59022567fcfb174163b75efcb088372cda40b5ba469304f6a261d723a5b6e7ef035f0edc9e9fda2b0d8893b511ca6b2d3e326f78f61b9dfefb23bc3 SHA512 969c9c04af9785faa89b9e9e7d725c8b0659a96bb3fe4a73e0cc057303e3f710376c8c294c52b81f5ec5070fe41778a20e605722981f2ebee2d350c2cd0bd82d
+DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
 DIST core-foundation-sys-0.7.1.crate 17166 BLAKE2B 908467224d5d17320737779d0692e31b3c13ec88f908b74c36a945efbcf0b4674fc2e2d6d62d3a9de4d6748435bc9796a124d65584ac782b0d88772d1bddaa48 SHA512 89dd9d787d7915349b08e5649e8d9bbeba8e517718d163008b9c4c6471ce274211e8e5127d69b557267efcbbda8189f8111f937994e6176cce2fd3fac1051511
+DIST cpuid-bool-0.1.2.crate 7173 BLAKE2B c94598ab349d87a0859112433d6fc31e46eb04ec8c0edc7ce1f15a31f9f3857f93f067c4ae35e648bf2bd4f54d1ef37ffc1507b5d6eec8c3432636c589d1d8c2 SHA512 7907fc4ec0d5ed370edde0655c8223f0df6ab06c2c297c7d3bdfa958f601550851331e777065b4fe21f01f46610604e91ea2e20aa4b4147f441319224f69597e
 DIST crc24-0.1.6.crate 2378 BLAKE2B 11fee3c15059ae82dd5bcd3153127d2849929ef7df988fed1d0b01de56ad3b327e02c8142ae5a55e6399f7a5fd842b26ebe713b6bb153bd8aa3df4b78d50e5ff SHA512 942b1d17e97b8646f2f21f910d188b457143729140bb4ff15ed12c157f4e2dab52a04d4900164c85ec96806b19f17c8b1fb927cd8cfce5ce7a1451f0f642d679
 DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crossbeam-channel-0.4.4.crate 86868 BLAKE2B 88629c72c0be41bb3a0d7dc92f6908d46cb397223449da5b2c990b7660e09dfd3e3f3fb708d13586f5dbf199d62f781f1f7e0b73d279de0ef810f7bcf25b3f27 SHA512 2933721d6af3126f492f112f3d662fc40fb49139a84c72d33b6c2b0aa94fe964acb302fe726e999be4292a1410d3ee896169a0434dccfbf44d166008719846d3
+DIST crossbeam-deque-0.7.3.crate 19888 BLAKE2B f83e6915624ed8d01e56ad28e0a40e84732d820fd07f0f0fa4aac9578aed0f4a980bdcd64d29811be2b5055f28135403faf091b902dd4c800d6d736452ab03d0 SHA512 7c6a42643b2eda7ffbe2d485de4d3723c6a37beaf77e81329e39c9300a80492ef46650fe5a6b18101d3f6b4ed031ddb06174624f5449998ec3a7808e979df131
+DIST crossbeam-epoch-0.8.2.crate 39283 BLAKE2B eaad3cff833fb3672c93f6f0f4ca7073c709f9ea489c034da5fb2dab2da0676d493300c66bc746c8372369815aac3eec2ab9cb875dd9464cb59ae25c4ef4c6c9 SHA512 7406e92a768dee07c8d13b0fefd658e9eebfd3e89c782c4690740353c0de920013c345d6c112a78a2014396cc837ce4fdbf845dfcfacfd7a57172f483bb9b8e4
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST curl-0.4.30.crate 83156 BLAKE2B a48fb97e1d784c4f6961c382ccfe58c04d60b9a2becde74875bbbd21eb9e45e54c34b52b433e0e5a3da71975a4a8ba830a12d7176853b707a008e831e60dd864 SHA512 d628da80603ab42e2c7151c478103f6c8226ece546b7eb84051a216e1a20f48201f39797d460dead601c02f4799cb6c425a57e69bacfa14bbf7f3b0ca6f44bf1
+DIST curl-0.4.34.crate 84129 BLAKE2B 94397213cbbfcad521bddaeeaf0b8e394223b72871cc9e0435edd4e1ba078a18e64e830f835c436285163512801408f33c64cc497c059d08d1edac1527aae923 SHA512 50250a3d5bf5b3fa899089a5452e9cd1dbb6553647ee52c0df4fb5837878131c4bfe84cf912e6cf5ede945e94906952051f4a2c4ea140cfeb41a91efb36f61a2
 DIST curl-sys-0.4.32+curl-7.70.0.crate 2842860 BLAKE2B 9e459b9b7072d26e18f834422f3be545fc2e8906518df406679517b22dee6f6ab8f4134da59b2b335ebdce99f07e76b1e8636c390566ef9b84f8dc29efa59378 SHA512 f5b1685afda8339a88637b118b7520a6d9c2fd599887054c9051ea127146a2cfc6f6e09493393e7028a0990ede5acbaa1456cf1422e62a3b2901ce4631657739
+DIST curl-sys-0.4.38+curl-7.73.0.crate 2874241 BLAKE2B 62dd933d537a951c0f91205027327610d67f1e6bf5817b8739302a7443d5d62a6f10a7f08c4355f5e867ba41ecada8eff613b3319a9c4c000078afc8b829d6fe SHA512 b12306216560697f856aa615281a44a091997946156a2b0732aa0812aa11d26fb5918c44b3bb1d3a55be58005eae223203fa2317d018b99e19e22fadea83eb8f
 DIST curve25519-dalek-2.1.0.crate 506608 BLAKE2B 3c0e1af8ad16cf93d12e1f2954760cbaf16f9e7b77bdc6dd08ed67b0c69f8feb9a02d53c26b7c2a4de43538137dc3e28dd63b4dda88013075b00afd94d854fa2 SHA512 980771514c90c6b6ec57f4a96bc84a361d6502b21ade66a3ad1cea49342894ac2977f4281b972a542137c631ad4ec96bdb102f77b695049ed71952cc3c7a649a
+DIST curve25519-dalek-3.0.0.crate 506759 BLAKE2B 46f4a1d2b419965ba669586e9c08141bfb9a723222ab9e3a92b5dcd157a3478097d9ff5816b3a8cf7a710a31b03e2fca6199e88f3dbfe628eee0825d0b1832af SHA512 f179953feff8cb352632fed7a52e39bde94f596d043fa517fca24fc8c13e6c07c282ea431423fe5c6751679629fb2d640333468c9e5cf69098204db6be2dc9b5
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
 DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
 DIST derive_builder-0.9.0.crate 38161 BLAKE2B 08bcbf8851ba813627a56e3f93a95f08a938e0cdd4f2a7971961eb5ecbdd3c96f6143214b49d8ae6cf6be166a934208ff7d0f768a3408868cab093872860e7dc SHA512 e56a01ed13420ac024be394883e5cf148f83ea74d2488931216d84cd2e8f00953e2d61f9b81d34f18be40bda055c02614baeaa89d5fbb9d3defe9ed314f2ef95
 DIST derive_builder_core-0.9.0.crate 18328 BLAKE2B b7a70372bf9300a2957927dc6bf45d64ff923552d2aff463e9811cf295d8bf300f8e3a03c73d08e1f727e91bb0eca2d34e332bd65a1b43506b9d486e559c879a SHA512 432e17868ffbbf6e776ae885eac33617ce06e5f1cb9610e2ced4f17a0d2aa46d3576ec3249f92275379d875cd90dd86ba4de882089ad620fe6497fcd301e4fdf
 DIST des-0.3.0.crate 40411 BLAKE2B 3a95c95e2df4c61eaaa6effa8123f8a17cf0d7cb7a0b239331b6a8b90d9c35f7d2733db52fe30007465ff828b17ee285f80dbaada7d9ca291bef45dd51c49844 SHA512 1f478ede25d1b8694ff8cc0f5c1ff154601492cbd53e6b82c7e2d00725f7151bc718ae779d66f7d829d632b7cdd58ff4b137ab010350ec0d1b984222e369f054
+DIST des-0.5.0.crate 38958 BLAKE2B 9c1ad1609965b353e804141ed7ba36f28e954dc33269b53ee3ff150cf5a92d65b271a50b6b61a394d7d11d62693c115667aea22a705789d9b4a121ce08479e59 SHA512 a671f75cb5bd5dd9842b69d0af6d5fd26d6c08d464968c417e0e74bf4d998227ab5512ebfdc7ae4b70749afb28c7939d1306163b1a29afbc2237e2480490e52b
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
+DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
 DIST dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45
+DIST ed25519-1.0.3.crate 6334 BLAKE2B b4d0b793868b7120d5a07a00d9a8f741a2ad39d26a676bf9ed55c89a2514d06bf43acf06626bdbc72a36c827655f8c9e6140a2db212ae77ebaedf7f13d00cfda SHA512 c11976d193fddd1653d8e64a4bb18d392749ad73802699a9f8beb50414f8f2117ff647809e04f45edeed95aa6a69ab736f557a5856ae0aaf4dc7d3bb9a6342a8
 DIST ed25519-dalek-1.0.0-pre.3.crate 27395 BLAKE2B f1a5971aa04d390569565113a092af692082b59712b5a76759dfaa3d9cbfe39eec47ffb3a351dbd907faac691d0dc588dc429841400ced0a4ce72355d11ed2ea SHA512 9f6409e66fea1414e5968669b5594750693379d06f0639e3089a747e348a43178f06a62e36fe7f32a3ac9ce8072c1935593e131f5463e9f82e7bc3a198a46230
+DIST ed25519-dalek-1.0.1.crate 29460 BLAKE2B b156de45f81957a0f631354b7b438e35592306045a00360df71ecc1ae3298eb737fbd436b2148c471f94dacd08ef1c04dc193feed82b1d9963809ac999decadb SHA512 e3d6c4e9a8f573783817e9ec905e5fcb76f743c91f45bfff486625cebca02e17b5fd2c222f03b73932f8bf5ed680e729e6eb81f541d3f32f6d82b7cec4df7fe5
 DIST effective-limits-0.5.1.crate 20558 BLAKE2B 1658c41474411937d3da1a189b909ab8611298128a14c598a56b8bdfc4361293825fac1f55ae09a11dfe95b645eab4a363512ece0f79b547adf66ad0533b98a2 SHA512 a30f9f79e6f6690d62b24ff15a11e6fe169204edcc88dcfd76a167c4853a599debdf8575f5586f9900d24e8bd2a751be4330fad3127ee2eeebe92302e022e07b
+DIST effective-limits-0.5.2.crate 20795 BLAKE2B f1fa0d55557ffcf61b03b1d64616d4bec8f127d06926840471b446e3b3857604a99c12c2585d7153f29d9f17d7f91b97a6985b6eeee00f00628b4e10a9441459 SHA512 f782307b4f4be1a4b2480aaca45a2d9025798edb1101054e6df0936a79babb873fc51fd605e98cac736ffe2d41cac692c153d86829e1e2f142dab3d160dc7321
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST encoding_rs-0.8.23.crate 1403543 BLAKE2B 1ab7da7a4313dc3e0613a077bd9d036e91eec75913cb9b742879eab17e0af7dd76b69d7a17133f0c0c35a1f8c0628058415751105c95b63e2f578e9a57cbb71e SHA512 7036f64c0f26b3d993c1ffb64ccdf95a122ae93a9ef691f9903f90925b222b3aabaf379e951b5e9fc40726a1ed52ba54f3eededbc1e6b68385c99cf2c34d5ba5
+DIST encoding_rs-0.8.24.crate 1366911 BLAKE2B d487d36a6ebd6fb31d7ce07acf4870a271ef9384bbf08aafcbf9951e919ae63acd504886db07009d3163ae7ebbd7e8e9da0e7aaecb400b1534e112a1325f914d SHA512 bf94cff1b1a6e70b73d39aa531ab2f7de130a8fbe20726fb97d502a20cce6de3571a1f306f0f8bd6aa90ae535ca874377ef3db2d3669fa97cc12878155d527e0
 DIST env_proxy-0.4.1.crate 11256 BLAKE2B a8e3e4f8366a9a578da09903c1b1e9ba2c4e37700ec5600814c8a1dbff740a20dd6147bc1fbeed385137ce734477c734ba370fd6a824c64d571da374554370e5 SHA512 333232b0217eab986b4616061b1419e24fa95b55d6f58cbd3e6a8a280b1f8b6587ce5ae30cfad570e7cebb2327352c18b6a8ab27007dd870073308127d2cfe00
 DIST error-chain-0.12.2.crate 29761 BLAKE2B 2de434a42d2c62845b0d0801cdbaac09b70bf3a7d940b91814efb203aa686a31a77bb36fe12170dbf392cf0fd6df75b46eb0937214cd8c280cafde721e6535ad SHA512 1a64c6813f07d23b091fe3fb69b745711ffcacceffc2ad5e1bf76917ff15d48ba370d63c886441a96a8a88cf645224db46a279152ce6b76878bf8699fbcb43f4
+DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
 DIST failure-0.1.8.crate 37582 BLAKE2B 007652720edab76efca83ef23a6f29dfec2a8949e88f697a4609257d158d345ebd617577df9cda69a25cae70e02f96479f427ee3059362771a4a1459bc4bd1c9 SHA512 a8762c978c286f921ef9c46dd17f57656739b339656ad237f6fb43062a8b2ad97cb98b977ae04735312d5328894b45c512fe42e33a9bdc4ea898330816b7a884
 DIST failure_derive-0.1.8.crate 4950 BLAKE2B c068f2a122e1137aa8a31e3a3c4c333f1e66f1b93df144f5a07772167f9085241292b85c55adf33851c319a418bac19fd31f4fb22b87ebbbf2814cbc815b77b3 SHA512 3f11adeb616a2d57e1a33ec2a5eb71c79a5df7946a27b74acc7c89a67c5dc6d01222731b37b405e33493570a98c96c7d2c7b8535928d7cf82536bcd9f0df809c
 DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
 DIST filetime-0.2.10.crate 13880 BLAKE2B bc2289129c0d79f37b2589ee31f7bd9719c1aa97854c0c06f321a394202bb96e86b9ec8f8727735e4925e214e6c7f75d87578ab44530a123807b5b7eae7b1097 SHA512 45d1b6fd6017bd1a479a4e343b8651c8d426616cb68914c728456fae2a27bb1a45fafcafeb9a12c89c4eed835327e461bf92b80eed0f3a4e84b196b584b8698e
+DIST filetime-0.2.12.crate 14272 BLAKE2B 39969d952008f86c60b1e9e2e16d0221385b286eca8c093e225410dca615315d1d123008f6586c128d5660257791f6d4cbaf0956d858ac1313f0d89cbb025e22 SHA512 9806fc9f7e15ef35a0d36b1e099c5fd4edafb0f6592dba380211c4151b9fd83971cd554b9f42dc051916f48ac6e34ca1f8140e1361c656028be7fcabbea584ec
 DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
+DIST flate2-1.0.18.crate 74164 BLAKE2B 7defdf3f084f18c9e7776edda9bb3cea5692de0d9d2d006bcba0895ae3555f4ca006c76733175e4982932c67e6c65fd59b21275f19572e23dc2eed8f331eafbd SHA512 3695e7de578da3bc935988fdc67b22ded26f00bcae6818eaa6313c47628a19b66ad589b06e164ddc4c30c49eeec2011e41031287071a43460a8c5bf8e7cb5cef
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 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-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.3.6.crate 39860 BLAKE2B b2bdc4500b854757b25736bdd02b5e1fd0912bbaac88dcc99774743f19cb51923cb439e18c5454dde1e6638597a07cee35754797513939ffa2ede8fddbf074f0 SHA512 862bbc7854e3590befa148b74dc17e2756fed8e98fe4b1d2c2dbd5b576dc24934deb89cf25a800b407cf07eff0aa3590142c44f0fb98814d3a8144e46d232e3f
 DIST futures-channel-0.3.5.crate 29053 BLAKE2B e951124135520dd3306faed9355bebeca1ac2e2448ae1e8664751c026384d830d1aca8332690cc84c81be07c84e97c3321758dfc1f76147bf857d19a3043c225 SHA512 5d192fa5cbe1f175c578ba3f8c0bb0bff4461d2699babbd6a4ba22757abcc52b6edb854643da2521d7acd3f78269f3eec9328c2c19d5c984a8e02f071e249a67
+DIST futures-channel-0.3.6.crate 29465 BLAKE2B b8c1b5986ffe0d4347105e60bc3ba2f31ab50c35850e89788c21501eaa750cb6a4e94200d54eece7212412d531b59e4b54788a71d150b012234e61e2ebdbdb8b SHA512 efe654a51fef33563bd83e0819c6fe033c3b80615aa005823c64c1329b2036db89f7c15275f850d5e1e06a2840fda3c30774db4772380bc198344564f89784e3
 DIST futures-core-0.3.5.crate 13541 BLAKE2B 5eaee458fffdc57105e33c17e7d2b8eab82d05195a8333a42266241fbd1f772afcd0bc82adacb1799dd84dd60ee6e37e5130f29f945781d6130e4ded98bf6dd6 SHA512 5af82472f569d1d118f6f8c900dc8d1df58f1bcaee43273f12bc6e0c72a57141c797e5513f9a9d6cf969c7e4472b36bac0ce74435de10a76cc444d896cd779ab
+DIST futures-core-0.3.6.crate 13838 BLAKE2B 346faf3d95f7a4b4b2bc5e6cf78189fd6deccfaad2ae16c6dff85c9e4568a29ba4e6aa97733ebc700172d40640238d320911ac671743c0d39ade2244a3cdb7e2 SHA512 7a451155119281636d1ca099faf876f9a18424ee5621d8cb804853dc8b8d1f474d076f0e838237a4ab28786f687e4ba524cf0b44805e22845b057535d4c07a25
+DIST futures-executor-0.3.6.crate 16639 BLAKE2B a7e600f9a7a69632179567073755684c4d772da6febba61f31df758c57ea8a00d3f3528f633b86305d83d338f110d5f4581240fe069c95ff22631909f52d0528 SHA512 7ff1074d50ca4bacd36b5309a3185c28355443b9c658487e8d9c788e9b09018c382a4825ca71dcba8db0617e27b4d475b84032fac4e1dac8bd391f0d5590679c
 DIST futures-io-0.3.5.crate 8981 BLAKE2B e7d39b914ad50088b14a82d82658adf59af7df2732894bc595aac73173b33c0dd4139612c07c8ffa5edabbde8445d039f36050e34fe470ace5bbb0e299ed9597 SHA512 9573140f9ccee3e58d181d557f09314e13cc16814df06d6d99c2d95733512a2f046cbe3aee5654a9e461e4d76b2ca61f3d1d6b9040a06cbd12efd3754d3b774f
+DIST futures-io-0.3.6.crate 9129 BLAKE2B f34a6a3d610fa5cc5f51a330f806857cc61c0346a861330b2c8421bb81c2604e366fde12ec0ca9d25d1e62c163096f6a6e67398c5c599f5b6d3056d3f5199634 SHA512 ae2940fb1ceb421d4b9b191d60eb5ab3c896390aa956fdf61e5c0b85e02436c07ff3685c97569d3050c8e6d3e7aa8cef257f838e503276b316f741e9b257ede8
+DIST futures-macro-0.3.6.crate 9778 BLAKE2B 073641683b4c8af3bed064251d33c49013de091ed99e02173cd5a4c3507989a6e80e2fa5e18b42044900938d25b84744114ae3a1f7f141bb872dbff728de4c33 SHA512 9e94703385df630ed68058c063779ad6e5b9dfb576607ad87234f3c2cb55a7860f38cbe6baacbde17fa943ac6d890e769962aa0d8f785751025a3dd2bbb2d860
 DIST futures-sink-0.3.5.crate 7612 BLAKE2B 8068fb497194702c1dd2cb8612d4bbf5ccc36e3a8fef84870635b887cec0cc83fc1aee9b752c31c8e582a0863a6b1921c00a7007e4784c64b291658910dba222 SHA512 82f8d6004054ee8d799fea751cb4f0bb6d8f7b364d85780d16adc8fe0959d96cfaf49f4cd89d50818e1c9c24d0df17c8d563fe4a2e0ae5d534bb301fa90b17cf
+DIST futures-sink-0.3.6.crate 7730 BLAKE2B dd3d69d6c5c2d6656e6f3fa1b436832607e924e6f820d7ba41ec569df6b891ca30b33a9a1864d5cebf995a848f90b5180d425f37244be71d3359c5c4796b5996 SHA512 cfd2486a965a3f98006c2e61708902f4031d2aa2145c00b0945baa71219b55066f7e75a47e33571a7774735f3d56161e216bccdbafc7173bfd4f9ec99e304bad
 DIST futures-task-0.3.5.crate 11030 BLAKE2B 272de7f0a923bab04071b705b3b39683022538a756ccc22a8582f048c83155d6da12ab804e70cd32767c318b94f0f71ea0e7aa6d1f77491aabfc6ebae08f710e SHA512 9affcfe1c64ff66cef77615d39c2e69e40480aa7fb0d1a0b136edeb9533b336e3e1156bc0bb14120a812f0f8d3d3266c556d9f0e4eec147fdcc175b3183dba52
+DIST futures-task-0.3.6.crate 11130 BLAKE2B d358d85320f8791982c03170dfe881517847c289cfd7d7c23fffc12c049aaccf0e7c79f1503ad784349a6969987c11433d1f46633e908da839b755a46c94fedc SHA512 0617fb23da9c32505e1dfed0b3a8c09e0c222077c0ab488deede6301e45b5e9b147d590e24089a02c4a5bcbc69235ee3d5d576262dd6fa025d26e47f308577c4
 DIST futures-util-0.3.5.crate 132197 BLAKE2B 07cf5f757cd9bc663266b18025efe200fc911c6d829bca139db4c5dcddce5f5e5dbe62968c6c7b328a63a5f23d0a232087e162f926716029ff52c24923bb7c53 SHA512 f71bd29e113fc8aa3795904b3130dd6f09076e6a19e52e34702973b6428a1834d300fdd3c48259e7f27fc1252dcefc80a4b104962fe7e6e4e536322d0aa9c5a2
+DIST futures-util-0.3.6.crate 133258 BLAKE2B 40cd706aac3745cbe0eef1971d6715e6ec63ba0ca809028f1ddfef738d238869dbd639eba052e53479dbeb3eabb6f510293a0d72c3932a994613fd4f90fb465a SHA512 e4ecd57290308555e4416eff17ce18ea06963490576cd7d40c97e6232134d321a5502d8d9436cf7abcaa792e6e5e4c21942d4b43a2ae0b3221137e94da33db79
 DIST generator-0.6.21.crate 28473 BLAKE2B 5f87df0528b8930cb7621d419b944301761d4a2f488f723e26697fc9e7f5acd3a2d6e138148ef734fd2865519958e19a492ccc0aa08fb189e7f1277c302f06c9 SHA512 d6da62cf4d37d22b250b8d27c364e870e22b9ff040dbafb5a3697244da7852ad6f4430b66cfb13f285728da5b180e048a918445022c1268ae393b0c6134ed256
 DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
+DIST generic-array-0.14.4.crate 28916 BLAKE2B 41adcb738bb316d17967e029a829dcf7377427977309b010c2f2e365f16306b44991eb5f65698782497f614b129b14cad11bfeba2ae19b45efd117114492517e SHA512 34ac71fee2cd50ff786d39b4abacd9e090a8598baf4dc36ba5fecfb7171cd8e4f58e5360cbb0baf02a87eea26b7dca85b35555b82bbefe06635d2fd38f7b8b40
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
 DIST gimli-0.21.0.crate 645352 BLAKE2B b32a76d22a63958f6007110d53e27416a4f8ba429a28dc5b33fafb424dee57adec97de558f016010c83a0259d49acf9ce99edb973583d071dc441208c2da8061 SHA512 6c346c622a795a855e01db47b85684f6a8b4ca8b41cac472e3b6bc9ec6afbab344df9c3b2451332f6264b7c93d4d05986847ad47cbc7e2ee3049da5a9d6265b6
+DIST gimli-0.22.0.crate 704135 BLAKE2B 6005ac1e358ad80f8005f02d6e606c0c46d3bb4c71ee84090999d031ebe4fc1177530bc7c641156f104015c8ba9ecfd9988e0b3b33ddd53e977423ec07584b30 SHA512 71d806bb2e675ceed595a6367ae2d991f5a39cca89f371c393cc97d3c4c941e227faded1f83834e7599525aed821b91915268b500a4753fa002a898df79c399e
 DIST git-testament-0.1.9.crate 9610 BLAKE2B 55baf44278ef3d8a5cbc2b422939153c8d5ceb7f33e342eac40888c2a1948d504db2b8a280e94a2c78fa953908e0b84b01e49688ea9eee2878a6501dc25793cb SHA512 a93a18ed37cee65c48f67c467895fcac92ae36aeec02f6b704a78d44a7e9789d6725c321eab67bf04460d6fe2e7bfb86e6e263c008694d35463490600f2e38d0
 DIST git-testament-derive-0.1.10.crate 6854 BLAKE2B 446b54c7d64bbcd5799bed6bd2a337f2f3612ec0c50490eb9a47b0dfcf33886a6f2aab8702be0b517befcff5728ffc723eeec09b3d6cdb82611340f94e8c7bdc SHA512 01ae8909a66eabe7e6012f8c32274e19291d76c36b17cf37f98bf590d9208897a2cfc11c4332d956beb198fc6c8c16da038b0e5ae7e57268e8e4fa661836f49d
 DIST h2-0.2.5.crate 157402 BLAKE2B 216863d7008a5e317d1c8ae8ead2521cb4b1f057bad5f20031d7b1969fd48423c315ee847b6600da4b1ad3ed44bbad985b95d9eba8dfd22c4cd54a805844dc6e SHA512 a762d0595469787994668222d415b2dee0b77cc61d7abe7ac463713b89a1223576900cb8da99046849cf45f7dfff1ebdc2f15b489de8b516f8017801ba52270b
+DIST h2-0.2.6.crate 157564 BLAKE2B 2ee71e186424c3bb03febae82f2961af74c96db330a19b9f235aa40ddab367661ba7c3d1a999eab95f83340976a1fc7400db5d2e5f72ee83a9f8ec87d8acda7c SHA512 edeadafc78d1826c6ce499c06d50d703794e89c75abb23a136cced28a678d92528be0184d0a70414fc1c70b475e5d4bbdeadadcaec17c4f351d44a62f4d7664e
+DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST hermit-abi-0.1.14.crate 9556 BLAKE2B 03b27536c3a8ce98d26321439ea6d0b14785fa4dc1666f2bfc6142f4f79d003393aae4fa0e351f6eb3cee6719bdf14e32fc6e07f5aa6f75916cdd20d3c1f5be4 SHA512 a3b5eb8462f47d9a0d7342d45ded3c22578cc19bca05ea0856daf04f263d88b0ca1a4f4c1daec14708282dbc39efcc11e100a3a7fc2bdfa73522ce5575ee7b8d
+DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
 DIST hex-0.4.2.crate 13385 BLAKE2B fb185e0888736515b8c1c4c00f831f1a4a7b2a04bc0262c80bb2425563b3ca8059fadeff8660ad738bcbb522d432dde98ed6b14aa1fb8c03cdcfec6ae282a55b SHA512 b37504fa6e41caa77c924b24893a7b505330aa8c39501b3ac283fbdffa9af2b89ccb9ae004ff415af1c813fb3da222dba62f17bb3b6210a259661e2312d099a5
+DIST home-a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz 10281 BLAKE2B 283ea853ff98658507194902b501cc0c6438bc2dde1007f579fbaf92917b906e5b9ccb322dc4d34fc01e08809d24194db10ea9c5177c0593ffc94bbfc934353d SHA512 39343c2c05adbbcd6a4a581abdddfc2801d9b052894b1edf3df304526045252b9b16b93c9db4fa248f308b762084cc7b97c3163c47d0ae4776b96be155836985
 DIST http-0.2.1.crate 102231 BLAKE2B ffefa83d03344fbdbe2e41197c2df7663ba45e6795e7c8a0c503fd666fd0dfcd05976d85ec67685bcb8486b0fbc1a29ad98211a51240e0439aab8a670d976c0c SHA512 50ebafcec96555e04749b612e221521a09b3f04899f55b79c562e07bd0d3d0a5550cb50425d2d97cf6b8bbb64fae98b59693943cc27a5c52af132923d82460df
 DIST http-body-0.3.1.crate 5394 BLAKE2B 9dd7a35cd22d22060762e17f028e9353fd66fcdc81c0fcb2f0361dc7ac86bab18b89ba774f28e2e2b451aebd01a31b01029587a3d119c5a30ff176c203482367 SHA512 0c81b2d8512be3f07d5b08534d2a27424fd6abdf175e9bad9a657b9d95a48e2916c8713bea8de3154520c7ebd097324de246a1d2ca6595f2355e1c93fd9fe6ee
 DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
+DIST httpdate-0.3.2.crate 10768 BLAKE2B b435d0a530fcab46496a921a565c3ad8654cb39ea038bc942c8fefab8dee2576e9b157f203b376e80a10690650c1c899eaa29e5af75888c8998b07d5d049fa97 SHA512 5cb56c85aac5acc0e9e2c72fe0913d2faaaaeab10a15c0479407ab779494bd81f8e3fc9675f5990186a34689e841427e83723a87a91a5204ff57188e89be98ea
 DIST hyper-0.13.6.crate 138763 BLAKE2B fb32d13eb0cbf7d842ea7b725589eb41c32d6c0ea2ad0c1fee49e48c63304648c7801e7727d7c14e4a532ded649fcbc6a0144cfc3089a1d6e2e396d554d43238 SHA512 827b90db8252a7e29553785b03cf426e836d2cd0bfd9919cec3166b548ecab03391218d9874105ddd3f6e685d3f37cf48abb8cdb671c449d9a343829624d121a
+DIST hyper-0.13.8.crate 139668 BLAKE2B 1dfab4e7dc1d14ff38cc796d8dfa619300c5edc110db14bee994a4a26499e5bd19c3349ea9e89237575c0f9842caaff6f8b45d70c3eb74f0838b47bda0e8b26f SHA512 6cb97297374ffc2de46a0ffc4fda52b7076ee4f27dc8dbdd3709f24469049def3b09de76ed1185a52c4fa24f8ce2fc840f106cd01dba03e3094d5066eba3f4e2
 DIST hyper-tls-0.4.1.crate 14372 BLAKE2B cfca93661c400e43fa995a563e66839ce42d5459f7b438199878db7a952c17b9f1640b1f544e039dde8abe05c764607067fe8d4c49759e18156a9da73b345d96 SHA512 acae463feff83342d4c867bf9055e066223591cdc18f995e56ec9377c6c5dbe37864743899be3b79104a629c4a3247dbf5fc257f420f3e1acb2e28d09d46398f
+DIST hyper-tls-0.4.3.crate 14195 BLAKE2B 9dd7586f873554af044a6ae96858337a083d9ed5f39ccc89391a6fc6ac534a2c01ca5bc750139598329cce8bfca496cb0bcd5c4e13259d3c9014762e2272aac0 SHA512 4b16103a8490d9b39569b589747dbcad60cb5a904cfc1bbd19fd6770bb7a67ea3de0afbe46b3f08f107a8e6ad00bf74e2049d99b5d4d1cd04f1dcec4b0a3c301
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
 DIST indexmap-1.4.0.crate 47871 BLAKE2B 0e47e62cf08a796f36f6a9fd898e9cb8839549a1e2b7a9be96306d7108791b8c5577589f2f8917c0835a3539b9437d6579028af0bab7d470b3badc968b7f65b7 SHA512 fe5def4e8b1f0955de17566a63b91d46ac01f58319da53ea6cf1a67d81d85673c8d9284bbb6ea4b6ba0d74ac42f875d572f64ca5dc56db19d022d3ace1f1b77c
+DIST indexmap-1.6.0.crate 47565 BLAKE2B 4b2c50788be5c5416973133c10caf092468444af6c101eceb5d2f53ec3502d73c034205186974efb335a1d8aa9a797b191a871fcfd573251c95ad1d13c0c47cc SHA512 f91c0d3588da037a2dc728c9cd823b4acf7edfbe7d59b28dbe1f5802294f2677eacf0ccea41235daa30b3d8187a97938653a040d8c9d2d38513440b2e82fd85e
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST ipnet-2.3.0.crate 25031 BLAKE2B 064888a6e37ec67f70baa4d571708a9173cc788921260511d8092a0e32982a0de4cabfbd28e17da812e1a50249e2106e82f95981163a0bbe71158b1bbca4158b SHA512 ff77e4ca8ae0fe1a8e9969e8e131081a092b258f64a7211d550d3338ece61dbbed499786b5e97a8515c33797e8cf41b4e38d7832e0d1b18584b0e5231c75a22c
 DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
 DIST js-sys-0.3.40.crate 67022 BLAKE2B 362f285ee89d68b7ba9f9c687281abb12930de94df5475f088a7604787f4deb07384a27b2c9a75d638ed4ecedbf59c5680cadff6c0a8008b946c754dd20b44e0 SHA512 ccfb02a3f84218287af109079cf34d51d449ce246358c6f0a1e993e97c05a755cece7d18db91947ef9f165952f29adb849ab6182b9577e6df235cd72e02809c1
+DIST js-sys-0.3.45.crate 67143 BLAKE2B ecae52ec5f1cc7a52baf3d82915de57f9351ddf5e9fa35d279336ee2d2d5547e640ab8387d8d85ce9ed2ef02ad63d985d26db0df81b482bd021f8a2bb260dc28 SHA512 34d27c11bbdbfd7745166045ee20c578d3b4b917b5017a24d55349b5064d4f4bfba68dfaf1f16ce7df06ca88f727afd61487e96cab0e480447fdbf920a0ff7e7
 DIST keccak-0.1.0.crate 5849 BLAKE2B 7795f1f9918d8723eab2b4e6dd99c371cf90e43699154356052fabdd1d4736765c13ccdfab51baf63088676d521ea674ef1b742f0ea8613049f0da2c46df4be8 SHA512 5514a50d52979ed616290309cb27d17fd1521ee89ff51131fc2cd2ab38bae2a22f00749b8de2ab75420d557c7400b4f59a9bddaa532efffb22a5fed5fbcdf65d
 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.71.crate 474209 BLAKE2B e380a6936248992b1b1f63ef0cc3d3de410d414bb19350a2327da3947ae0e8e700e82f0f4a802cc485e37571b3a6a68bd773f964496f572a721294623d135c1c SHA512 b6f6eebc42817107aa2f94d426154c2449a2558646414464a31ee9d9dcf714e641fe6613b95ecf9e751d77102c0cedb74b35ca1f76c6df2231a5bad168de5e16
+DIST libc-0.2.79.crate 511752 BLAKE2B e5da81cbbf3bd400fc301096750cc94683f13000b3f20461d2bad942c3999122fb944655871039e3bc32b9dc5037de4e82800db16899dce4685d80a569e21512 SHA512 943e097b3a4fd33b547812dadad15da33c98b1d78fd86579f63a78030a5fadd431d5d1fc969e67e1bc301d33dc550c0398ccadae26aa990d05ee474a5f76c634
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
+DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST loom-0.3.4.crate 53126 BLAKE2B f9eaaae82444b0be0c2fa82f2eb1baebdaa51eb01056f2fd591a0be577e12736b622664dfbbe754b3c1856179f465ff2c5cd5d7d98fd41cbdb970c2bb6b50df4 SHA512 fd56999d6a024659928298b461efe50e21e6e98c533d4e292021a4aacab59f033d89706ccd805f45d9f560f13220d60fa8ae59fb13683c034af3fff288a98e09
 DIST lzma-sys-0.1.16.crate 632423 BLAKE2B ce0df380c47e64bff3e95b60ee3772e0d1cef19b530461657c3ab8ac0153f4ede615013c8bcb2b4b9e1f1d37bd142bc940ab5e62625bb750562e5c75bc7b8cc0 SHA512 b9c3ed5d383f96f886471e89d8f194c70b022359e5e5504c3926aedaee76ff755e301b2f0aed95e8717ff1d9f2ff4baeb84a91d7fa41f1e0e0d069a74879e757
+DIST lzma-sys-0.1.17.crate 764176 BLAKE2B e596bdcfc1fff4d34b6e02ce75452986801afdc7bdbdce69bef07ab07d3ef779a15f4ba4e90881d138c581d022b814b32b7e94581ee2f9916e54d5418ef8fe63 SHA512 1801602b11b479c71552e67b1e0384535b7b6ffbfeb3abee122c2a965db0f07e98452d046b1036143047d4675f3749507eb144591eda083573175b392af2e0af
+DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST md-5-0.8.0.crate 13122 BLAKE2B cb74805b5b939e4261deb85de94b57ca0b64da03214221437f099dab2c49b1b4c2b1f2a6a8cfe7ea3047d4df41ca9117ff885516de06de298ff4ca416fcc5137 SHA512 f0baae0ede1dddb9be047f8d776fda2819980ece24e86da9d7bc4828308e53c4fa82597d416912ca115e75019518839a8edc076ba1e43686b0023aa559838a28
+DIST md-5-0.9.1.crate 15494 BLAKE2B 25218518792be16223f78ab0bd81284005b4a65defc538fba79dd3dc99c7d80dbc8b8ceeda51dbea4851bf1da86d3f66fb64dcaea86b5486a235c43719a3dc3b SHA512 300723a785c7edad2a9abf18fd9f8f9a40ba54676b394cb5712894d1170cc48199a0ca9ccd3b525f82832d5b33413c2565a0c079b6dd08c63d782f1a91fc3e0b
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST memoffset-0.5.6.crate 7382 BLAKE2B 42ebb93b567b339822201e31830971c32452b3d6681787c6969360c8db54912ae511580d8c899a3b9cb7f2fba98099c8df4c17534b97e4f4b1902d9251296527 SHA512 6df8952d41f60fa0993fbc85d112a15c1f6ecfef66da29ebdab71f40cd8ee8722400693b6ea023344f1b5dc351cbe828f465a8cabd150377a62948cedeb5db6b
 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.3.7.crate 44996 BLAKE2B 0e89ec4131e7abdadaa9feb6019b31853976a34434216e0f89ddab519559d0e1feaf2228fbc09906e51fb0242a18abe1a67a5362e080c19fc7cd00c2f95f08ae SHA512 d4eff239f8d6e947b94619e80fe03ed32aabd1a6393f63145d70ed7f08c51c45c7261d8157bf61c78d1637ea1f71ef15f9813ec733efd8afe6aa14810888718e
+DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
 DIST mio-0.6.22.crate 102782 BLAKE2B 8a088fb24797f4b16b6da28fee56a1c8bf1346959905c3501e3d78d16d169125c03495d9e21dc9da4fb6735a48af38b2883544d1c9ea2486d48542fde6ad47eb SHA512 b500b0271779942512c1d02756ee4caf4e00488f6929a06a7be8a46cc44318edaeb80abfaf6367d7201978a3529a6b5424679e07b719ee8194f0dc37aaf56ca5
 DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
 DIST native-tls-0.2.4.crate 32170 BLAKE2B ff0e24edcf4b1014e95990dcff7a5f2139bd3623b6b9809cf8fb95fe11720b8fbd0e563bfdfead36935e4d162b7c0829f51934d8ec191ad34bfe1d2ad2ede4a5 SHA512 810cda42159f302d315f05dde222e3ee20cfa30958d48bc547837f7d6df87a1b51d1239de90cc2901f48581be978c11f8e758fd69213a8a8fa85c71266302632
 DIST net2-0.2.34.crate 20620 BLAKE2B aee9aac0deb14a13c5f90793f1e439c94362403cb329e24607c1970c117bc379049da1b173d1bf827f0e3db38740a2d2e696981daf88c1b2302d81564be5433a SHA512 136ba95ad540545165fc2e34fdb5aab7da8f6b20e7682302ad5796b86cbf3d80b5364679c82caa19151b277f9d18de053968fda779ffff8ac88024940772709b
+DIST net2-0.2.35.crate 20660 BLAKE2B 8bfbbad0c8ccd364f1be6fd67b3087a0dbd7a6301b8133bd28cacca3d32a5baa9dcbbc81cf957bf1591b20512f283e3fd441190e33c3ddc09dea3f9bd5dba251 SHA512 5a5b4ee65654fec31d820a71bc50a0d81555ab661e4d3c1dcafb048588218d6ba347f1ce5423b092f078f3bce55f7c74e33193d1924086bb1d43a5e6efc80540
 DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
+DIST num-bigint-0.2.6.crate 87275 BLAKE2B a7da84e705f8aa287b6704a42ae1822ac1555d25e7f51e69b4288a808557dba2c0c15552085a67f3cbd445d518fc8d4f668f7264237263acc4248d3dd1a2c0a3 SHA512 19c1ff0ae6fdfc690ccfe4fe6008c102e50ab9bf6b1f4e4f04a348d217d4d9d538585945466b72b70713053bcfd73685d1a907e41d135265d330bde996709eb8
 DIST num-bigint-dig-0.6.0.crate 124115 BLAKE2B c83ba63579d39ef3716c43d16c3e21e15d9f968c653d447a8d7f3754965dbbb1749634469e78850d96a357a4746357581d1f4a82814648a5ae760b32e5337d33 SHA512 11b029c52945dbd460a8736b07affb425a27524fa1f507c39aa035a6fe298863d0b4f09bb8c390f77cd0bd73a65b9e6f010f9882e72c753c457788049d585ccc
 DIST num-derive-0.3.0.crate 12870 BLAKE2B c6dd72d95836655d839dc8133d7d7d0a26d31eb36c2904f0ce812f6841fd414e1f30105ec62834f15b43ee25c12806e12fab9ad345519a468546d1ef6e4ab521 SHA512 107ccb966fde3cd9983cce4a0b6499b4efe878b81be94addeb350d7c7ac2e001553f1d77cd03ba54d3a2ad85eaff46d6dbd8a0cd5efc3ad7569df6c7942cd734
+DIST num-derive-0.3.2.crate 14387 BLAKE2B d3598a856fecd06c1347054be35afe607e085345706d80f993df7af2b54ec89ea5f5f2e35629e473d2f5d4ed853ee098d0b51e5669f70ebdba72364a0b4976a6 SHA512 6e2a8248a72416c569b19c4a8a8325150889343f044e4228b6ed8ecf791161bfce911a6258fd34957ca6ce17611bc32dafd6b17e05e24aa8a5cf842120554d02
 DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
 DIST num-iter-0.1.41.crate 10198 BLAKE2B 6e444eeb858a6f2c7e35a67c6d6fc80726bcc447c884400b9deefe0e4fd473c699616321a02b3af3e06bbee39f0213bc712d4bbe511523e16e6782b842884a3b SHA512 886f734845daac2e69be50efa612e891b2d22303995fcc2410d1e0b5c034bd207bfd0c27e81089836a2aeb25ac0954e3bb284b105e1449df04335f4d2a4d077b
 DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST object-0.20.0.crate 168755 BLAKE2B b1e4acf49909d42708146d74950e9c5c8970bc62f639633825b5a9f15b3c7a8e80333182031d548edb4a654ef79f336e3fe5a582195a225cbe750bfead06204f SHA512 9d766227e9f04ca436d12a527bd1ce4babf3f930a4815c5176b1c42c5c2dccf0c9fe31a8130db2e58bd9fbe54dd9cb4427d684c698078329b95948b8c6ab18c6
+DIST object-0.21.1.crate 174624 BLAKE2B 87c4cc5e26e81eb91c3a88f0d1c28c080eb99ad245389be5cbe17b27707857fc096d02e3051cadbdee191bddce2164e77c4f521dafd8ea55be032f0748c2a006 SHA512 a2d625a2990b5f2a67f84163f6bce721eee9f699c908c3975f2a73822c0218848fb1a77fa6812a400a35668f0ca562834f1225f6f6ebc74b9c6ed4f23ebfa670
 DIST once_cell-1.4.0.crate 24625 BLAKE2B 6cfb6ffa2326fb53c4381d4b6a462928f96ad4133c653335c34265a1475c4f50067fcd2a6d9bb0660aab4406401edf02776ceff8d2b43c9d6b443998d2e3cdb7 SHA512 8debf21169653719820c4892ebceda67fedcc3c86e958aec42ade0d38247e12265a0152846f9284c37faa183e452ddf666b117e7ec5c066893cd33ec407dfaa6
+DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
+DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
 DIST openssl-0.10.30.crate 191808 BLAKE2B a6c76278f0d5fa3cb27eacab96d6430dcfb04deeb37cb8c6ecdc9b446f1bc8c44a69dcd83f50a8c50c56a49e8950303e807f05e90de3040a616f9c47a2f0caaa SHA512 058e9a483a9d0936e77626698bea5049608a9cc4e59a406b39c0b678f78c9207c5604286473dab334fe1d10d850fabcd786c6b54888a7affadb594f9459f5dc9
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-src-111.10.0+1.1.1g.crate 5104720 BLAKE2B 7c21440d60d8b45e80ce26a9eeffc9e6062d9d2691799e00a958266002d325fafe2e342cb162d108c56e6919930c3a08d6a67ce6f3528bb32e630619ce5847c3 SHA512 28da8cff87df92a6077e34f84ffdfd2d29b7d15637ea48e8d9afff2cb8d23d5ab970d095e11fd488a9f833a5946a86b2d1216cba0d0a5c9aad08166fc2e59638
+DIST openssl-src-111.12.0+1.1.1h.crate 5099166 BLAKE2B ebc8c7591837fe78d0475be4196c2726f7985aaa2f89958905f3e424f384db17dd468b5f50694fa1115f7b8db770f6bece06b053ee3b3aff4c892656f9e4beb7 SHA512 56091b8503bb5486b82b5d32b66770e1650beff2f6875908aa5c949922ef828b20f6766b28309a3d03eb3b2c255200d05d953f965738cdb636a3b045c5e8078c
 DIST openssl-sys-0.9.58.crate 47014 BLAKE2B a66f90a5cd9fc82ff22ad7481ca9e4a92c78852d25ee4151c09d5a4d23823942c28bed5d96d5130eeae005573d7120e7e5187a071ae81ff10572cebcc7db8b3f SHA512 098993619ea8effaa03ab61a0eaebc938d23cb8e5284b2dd45499972ae4c79abc36cbeeb51f34861a36816de9d02e2cece673f32fd042880669e99cfff181481
+DIST pem-0.8.1.crate 9838 BLAKE2B ec8af26444454f68b8e54515eb4a1762e14f08f0c2bdf0420b3886d1e3d07781696e55c1ea5fffcf91992a09e0a95944624ac454cd0555c9f02beebac05f0c08 SHA512 db7a18a7499885262432137c845a81b4daae1e0b6a6e8e83e58735f41f6efa73b3358354d39204295c88a7c241f10588be09f3dd3f034a266a34cfeda82c4466
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
+DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
+DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
+DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
 DIST pgp-0.5.2.crate 654951 BLAKE2B f06a19fcfe8f831bc4ef623847bf6cc0c53ff9134bd881d9476206a22a8b19c7ad25b03fbce0377405ff34c84a856cfbc2001b7930be59f6444124b36163ddc1 SHA512 2094be221340a4e69b3d142dc27893ef809c17a02a1dfe65369b00a938c3cfb8fe689d2682bdaeb6cc8187752ce9f9f05a08b9b04eae93fec7c88c53ce5a25bc
+DIST pgp-0.7.1.crate 657889 BLAKE2B e22025e42ccb51ddd5eb32d77823fefe660dfd27dfff34f3bae2245887571f218d1d2e2e1ea324d187f9bed76d1b0e782b9e0d75fdd86f5bdacf3f566099f02f SHA512 413d5dddb435d7a6f2a64da59e32e6eeff49ed6b9718d99f7825b957cc26063191c87ac3dafa81a5a10026d06c8b115a9c18f872d767451a6d80a8f63d3e3c99
 DIST pin-project-0.4.22.crate 53598 BLAKE2B f755c4f9cc6979585cfa99a9f331e91eb4f7ae062a2d9c9ca78d2deebdd3048ac4f147bbecdf9e7d12ac8e2df58e377e9b014a779bc646db3cd68750acabe64f SHA512 c6c129168b4894b8883e687d882cabe991a8a0ce5df50f207b1346f94aa7d5c295c743ece61e10f0ec356e515b38c3d886cd5a3b845c0a324097403e0e07be52
+DIST pin-project-0.4.27.crate 50964 BLAKE2B bc0e87a7941452591f53bafba891c758541034ce83e3849e8c6f1894e46c92f0391f4fbaee6d160706a6e7b02b39e9ff755efed35431941c96a20bcd2f2c873f SHA512 ca6537b882f0c7ce0eb0ab98e9cecc1620f168306ab1fafa7a4db13e092339f172874a30ad598db18d697898b5ef82896fc70a1b6f8e08ff0068f52a3ef5aa3a
 DIST pin-project-internal-0.4.22.crate 29649 BLAKE2B 5fe089083d07e39ba72f3aad2ae0118341ff6ee7da12743b0659f9c7ba54d8bdf937eba6e4cedfa4097638740690b10ee6e5a374d3e22a24b4da0f7999a1faa6 SHA512 1da295bd962141b9fead1a0bca528ffbd5e62300bd1a9ba85a96390b8ee0f8d0b2a74adea11e58c0424f41a8936457e1b751769632a640ae4fb6b5f49df9962d
+DIST pin-project-internal-0.4.27.crate 29739 BLAKE2B 7bc74da03503b3d8b5868e4ec297da0b69affc30a80827d220bf19e97449f30cdbdddd9c13fb2361717d152905daf373655b3df4b336c97b2bfad89a55f25c0a SHA512 435644b294be873247f2bc351a7463eed995aefab8ebe30fc29ade1ae18564f7c92bd1ad2635e2eb9d018f4bbba0b25549435588913767f58862df1337f196c9
+DIST pin-project-lite-0.1.10.crate 23899 BLAKE2B c2207e698568a1aed5396fabb7fe3cb128140b16ec2b09391cf39dcb3ac9ad5fa6c030298e7344890ae836e52d058339a6e2de6285bc17dbef698ef9f53d7db3 SHA512 f1d65521e1591c3d8b1859cc0d9a9e5a4e2d6cb75045e21cfa31f1ffbce43ea339b248d21245246eb35ad625d52dda99343ef5f0f5427bc450efbf3410192760
 DIST pin-project-lite-0.1.7.crate 23017 BLAKE2B 74fb5314d01232c24564095d8d34009189a0edb26d36a42a9f3abc35bcb669a96f6d45e078c7fd438f600e6c756acbc52e260ba509572ea5cfb59d8e9f63a15b SHA512 8987148688b3cf9b6d9928cd6bebe8e547412b87b11c23fa00236b8c5fc74dfbf200f03d219f0ed317ac0488cd2323fb09e576dbc17f1ade4e5e700bf077eddc
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST ppv-lite86-0.2.8.crate 20848 BLAKE2B ca85104fc1d6b300aab69c7b9367ba04f77ccde38bb7aad80cf1f615490696b27d61dcf242574abebe54b288414fdec2b63c756e47f188386a0f5523482ad9f5 SHA512 224db067f771eb48e4b0ddc2b7a1baf7389a47675ba93da50e3e4d6c88cef09e0f4529f399350b1b3feac7a88469406aa9b967377177a8c89605c49e1179771b
+DIST ppv-lite86-0.2.9.crate 20933 BLAKE2B 493fb977d0db8eb4699893ed1d05758ee7cf1b5610b767a2ec352f3f430edf3d1a3bacefae554fb16eb2786fe4fb9b574c7b9961458a938da9a79b9084f062a8 SHA512 d9fe88a221733197b43db2a2a608dd2acdd9aa37129af07ad2405d66171b6f9f4c1a61530013c7f9ad69194a2e52e7480ba80c696e97cf2adaea7677052cb010
+DIST proc-macro-hack-0.5.18.crate 14619 BLAKE2B aa2752f69e3c41d45ea3e06b197a49f6bd9a4ee063c50368adae24827d2f37d0bdd67c0ee51c4872a077827f33a7df775eb2be4d5d2ce9d1315d5627fb81b8fd SHA512 9d13326d9dff684fba0f4785663a6199541bd97d22875f60ceb6117025229377ab1a4c1145b68a24372e6b6103603d6db421d5dfb1b58f580135e1ef077ff798
+DIST proc-macro-nested-0.1.6.crate 6498 BLAKE2B 6225a30c1668ac20c3c9ded7633458ab7079bd126aae538762547b112012050e9aae22389e2a18cc14696212a092a9985bc72538d4ca4d37ca0faf34a68c3833 SHA512 ed89e9bfc30e8d7a9be742a02e8f269bcedcf511d9e1487866f198b4410a2802ab576171b844ed15fa2848689247afcd208016555442dc24fef7609400e9c38f
 DIST proc-macro2-1.0.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef
+DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST pulldown-cmark-0.7.1.crate 101344 BLAKE2B 798e4a2710643ef6fd86e4157a3de5d21b655a6f1d1dd5dbf0e62d17d864ba53015a74a7833647e63ba7bc8923c081aae5b4a40c79367a1eeb916a640e4d70b2 SHA512 c3b5bb456b9ac0fb1406f0815ed665abbacb25e449aa1bccfd1e5fc1b813cb0548dc84cc252b7746bffe791b6acbccab5ac6ecbba8e88bdda1241b0337d21614
+DIST pulldown-cmark-0.8.0.crate 106330 BLAKE2B bb59298b605993530e2363f3264c3ac1104ec57885c2dd183dcdf3aa9dc613999d24caeb86848ca3542544238aaa4eb49d5a6599d2fdef53af50b5dbead68e22 SHA512 396ade131c0a74cdfb8454e137e41c21f0b81b7cce654ba6ae9ceb132ba0fa0a467a190e6dd69cd7d59a267efbe83f008c9c8a5c9db47665aabc31a4bb9cb967
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rayon-1.4.1.crate 158219 BLAKE2B 67a921c77170092911b5acef76ad550a52906737115b422062bef8f70a8dd3d092ffb0faabbc4247d9d40770bc9a353c9d7f12bc92d1971bab8ba053d9ea5993 SHA512 646727428091def322ef395e032de810d228813f6ea2cfb7ccfc7dcb1a6e09112f469b5fb7cd9a05fba13cecce1ed6a46a53f03b50f691a9b50da2c507fd59de
+DIST rayon-core-1.8.1.crate 63681 BLAKE2B fbb6aa174b141e515a0733cf8c1308ab37ef70f9e0ba5355382e590180ec0151e270a73410802cfafce1d76e60afbfa41406e4231eff517161caf633f5f42489 SHA512 bd5c4a1cf9534229adaf7db52bbe5bc9409758e47cdd783fa0bd50e82beb7ebe1c531bd0a63a92a86afe3c9b14142e94cd7716d7296c9968f245186a228ddd30
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
+DIST regex-1.4.1.crate 236871 BLAKE2B 1a232e6a83e02b4fd2189142eb2e20d3f06d8d484f9012661aea99c23bfc8d56a04b993cab6a3fe85d29aca38a1b3ad5a8ea6cd5bcf3439d5d173923af9d9d1f SHA512 eb8869031ac156f10e8d031c8f5e5fab66575663b7daf4a0e86523fb3dea43e11c7bffe802d5fb7896e017e61afa856783c0541a1d414d91f322b2fbfaf8e249
 DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
+DIST regex-syntax-0.6.20.crate 293727 BLAKE2B ea19fdee49290481d20230e58da22d32e0cb715a93a67f98687b6fa8bfca5fea77d82399485a6be15b2a24d21fa4635c60cfe05b7132128e36a770fe86bf3c8f SHA512 65cfd5c493a066801a290d3663d5ceec738558ac7f3af9f3c3773065d9b6b02df006bedc556ee0dc377c032cf934426dea817d06f9639b837d7864f966ec94d8
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST remove_dir_all-0.6.1.crate 7854 BLAKE2B 42d221f06c4d33a06b8cbf8705fbcea8113d3194f920f1c34f0ef00826a6ecf10bbab18903540f5005e3d448b256a9cdf59e009eab9a2c0c93d022b7b258e580 SHA512 ff22c03887d28e503725394d8b34eb6e118e3aa83d14429d8478b8440daf93874b3c5407d7918d0660b1dbec633601189e840a5fa57889028982187f5851ff66
 DIST reqwest-0.10.6.crate 118989 BLAKE2B 8382f132efa584b6581966b0cd11bc07aa04b5470b7677a8085f9709c45b91cfa049034775cb14de5cf4b57be81a70f760b8397d005c95ad993254857402147b SHA512 1128b5f3a2a2014ea236054c10d933d380ab44b58011b57193cb84eeaac756b08ae2678ae805bf2a116127e3c8cd6ebd071456aac9fa4964f50a4ad176c2f7b7
+DIST reqwest-0.10.8.crate 122553 BLAKE2B 416645701f008cdef24b464a786a0527892ce5f89f7a47fc593e073e3545ed6a57d0ed6082d1e5ed99c696ded6a6306a042fd7fa720f8afd85943be154a4f6ca SHA512 aac1df2e57096b85bf963bf9473d676fffdd524c4d4738c2c79f6a2e277e69ec8f896eddbb809a5ed0fd32f05a61320ce259b6d5dfc5262b8aa8cb678f9f76ce
 DIST retry-1.0.0.crate 7591 BLAKE2B 09e1aa404283a379e2da599ac8de2e53cedfe40dbaff3f6f822444c402973fb155066831f2ceae6b96b35588f1a3e20bb9aec6b9615303dff0fbc08a650fe871 SHA512 40a53c56f893905145eb0dd8c0667d8682990b85ecd971820de5f3b7c8eacd898059551591cfd6bfc4fdcc101173cc44222a37bd709be749b6419aa40d41f4ac
+DIST retry-1.1.0.crate 7755 BLAKE2B a0601624edc84bc0f01ba5626d70c3783076c7266d82ebb24b55daa7d72cabc15f6437fd630bd86a44b4f7df8dd7e73fc8710bdf1df912bbd91d7ee7f34bb736 SHA512 5fc1e2562b771898279e390f1270fdfad93758df9fc684768425e111c89aa19d3c75af43ecbadab9563d1e52916475bd59f22c6c0b7e52b4b80c78c7eb2cfc15
 DIST ripemd160-0.8.0.crate 10158 BLAKE2B 6ddf34f858dcff0111d5fe6ab5c18d899aa58803a1692187c26dace11265a0ccfc3d10b1cbe9001fc994eb7a145793c0171451818f39162e6c00f7e99c396165 SHA512 7ebfdbe4ab9ba8be8f27711acc6a73bfa04e81157ebc908ee093bf65aa42c0aaafb21fb5a0d8868cc4dcdb44a149aa256ecfc86790af82b7c5ff5ae82c7025a9
+DIST ripemd160-0.9.1.crate 12087 BLAKE2B f2e0677b053cec4b93b1ba750e1a7ad603e2f4ff2f6750a659a7768627b1b30c429c91e586b61fe31531a5447d5f8d51cef1a874a8376df97b430a9629c11c7b SHA512 cd36d5b3224fd393f04b97a1f624ff190c3302ace497e37d040b5eb3a76c32cb413429de2692ae8706e62998ee82d82d13591c320b76825bf1b93ebbb3ab9ddb
 DIST rs_tracing-1.0.1.crate 4859 BLAKE2B b79dc0c0dacb963be9b96d534d1e051b7c9f63aecd85412ff530d3c6fe997241a3a2430431f7ba224f6dd56fad18d02959c466943af499887f2356a919937b81 SHA512 eeae1266a9fae1918ed38678a0e3d83dbb42779d0e5a82b3dd9b2329ba2fc18535783fd1c7c7f053f569d368f8444eb6a7d9127cfd7972d535ab3314535488e6
 DIST rsa-0.2.0.crate 22074 BLAKE2B 766106aeeb8e6ccae46285ce692c09cc7103aca7f18c6cc9ee38d18345df69ef47f18625ba2ed017326c6c687eb9193656fc0aef9bcb243840c3ffe23d9be7dc SHA512 1065d84fa9cf56c89da7ca5b453c6b15c5cba81a5c00aca6fbad20ba2afa40e21d5a16664269a6e075aed627d9c701fd4e7209b020f63cc9189ee1904e3d0ed9
+DIST rsa-0.3.0.crate 40124 BLAKE2B 679de1ee93ce654c5ab442f1d8c12f91ecdfe3ee5e39ee2e31980acd333ef47f32feed30ab8dd1acadc1d88d9bcb24a6da872144394873be718201939d90fc48 SHA512 04c58f7d07babf108b7c30df94de359c413c26d1e9f044aa4782e58e4278fa2b448dd659820235f857f68e7ad428fa4fc90d69f549105b56ffa71d924b6b6a01
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
+DIST rustc-demangle-0.1.17.crate 19956 BLAKE2B 7694cf9ffe9cc5d1a654538194d9e478b41d2bf702d0285dc167af20befeedc02aea3e2fe869419247710518866ee0299a123844745a5c7670f1df94a8cc6d77 SHA512 94938df0a7e72cbf10a3c2f74f8c7aeab46cf74c41fd981df6ecbea3d82c1791510e807c7ad8a7e0671a1eeb2daf2a28aef59fec9fa3de84b4870bd87bfeea7c
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustup-1.22.1.tar.gz 649454 BLAKE2B 86d9721a14794d6138c3cd8ab743592ecb35922633342fd52d904b2186bd35688d3fd9dd38e7c3a05d5342364c2a072a660672aead1af6d9f0f3ed21c7f7595c SHA512 14a978a3cf699956722d8443070b9f8a043f1252cc1a7ed300b14637a0e6d654f34088d4403790c676500cbab327e30fdb7f81be0b9bde29e552143f26912ac7
 DIST rustup-1.22.1_home_crate.tar.gz 10281 BLAKE2B 283ea853ff98658507194902b501cc0c6438bc2dde1007f579fbaf92917b906e5b9ccb322dc4d34fc01e08809d24194db10ea9c5177c0593ffc94bbfc934353d SHA512 39343c2c05adbbcd6a4a581abdddfc2801d9b052894b1edf3df304526045252b9b16b93c9db4fa248f308b762084cc7b97c3163c47d0ae4776b96be155836985
+DIST rustup-1.23.0.tar.gz 673455 BLAKE2B 08549f46a880d75df6a9e7f841c82445644e3f2bfc6fa9f40ed18c5e410b013ca33f499524bc1e734a00e380daec8d849f747df8fc01089315a0c031a62eac59 SHA512 bc1c0de67d485702ca0333e79189ce9769d8c209a637b6476aa9de8b73d49366fdc8f35ae5b92a384e7ed2c86121aa7326ddf17551fab7f4faf33836246774ec
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -159,50 +266,79 @@ DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 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-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.10.0.crate 20247 BLAKE2B 0352445eefc48dc9b34ce51a89e98215b48135e594db28d72c7729789b738c109b462e8ccf915c098a9b00c4cb3ef2182c1f3e8c4e8b64d85af042b752b607b2 SHA512 5477b586de589fe7e908291a30208c0e1d68f2d19fc932f81903233616a5e21fffaa5e6560f329ba07e4007182997ed90e1c9d34fae310aa6ccf47ee42e49b6f
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
+DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
 DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
+DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
 DIST serde_json-1.0.55.crate 114335 BLAKE2B 89118d6ad9c62b5177651a65391cef22258b3fbbfa85c8dbe38f99e7388a3a9a44f20db800ff2b62f0484bc1766d2cb7c9dc1088894aa18c2e50be5d45b98f77 SHA512 db81c9ddaae20ff5f712d8a2cbb58a95bfd139d9358797443c9ee10fb8af18f1396faf09f7335c249118feb32f52192734d61efcb0b40204ea58825056eea9c9
+DIST serde_json-1.0.59.crate 114956 BLAKE2B 27552d21b80d88cc3c643b25e5f0105c0d79a7c74c5bc3c2cdcc68050103ad73b75f7ee9d1d5afb60adbae33c351091b180cb1f8aa17c80f06cce4fb4c57f2d8 SHA512 2f9bf96fa770f9be9c43fc889e1671e9bb883f49a820aa69a1709d9f679f21f01cef2b771eea4d1fe7994cf850af44577710521fffdc4cc46d0dc6f913842075
 DIST serde_urlencoded-0.6.1.crate 12540 BLAKE2B a8d697cbe24c0b1dab0c0a42a8e2277e197821427647147eb9ce1217dc41635004f6374f1a54b00e5a7b6ee54ffcb4a2c855f8ac3177645e7a8cc1bd9fe0415b SHA512 e48b87717549d1b99f5759aa12b5c76507b26a6176a69f0a3c7297145b50b539344b43a827345096783256ac8053bf700505091c6d9d0e430bf01a990803d444
 DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
+DIST sha-1-0.9.1.crate 13354 BLAKE2B b8a3c61237dfccf193d4c891bc621c021eb7c5a273cba877102ad74d36f90c2b1f3e2a1e352fa6b95343883a0aef20b435b30ac7c44a6f8158dabf4ebab95535 SHA512 75ef1946aadd4f64f1a1757b5125afbf9d2ac0a176e259aa390cefe140aca0bffc23400083fa94480b523b70fb12b30c932b7541651e72fbff9032d585cbcf5e
 DIST sha2-0.8.2.crate 19851 BLAKE2B 9403b9b975b2a0d7ada7681f40659fe4b548e8da0c266f384e70ead2d7fe0d34e6bfd48204d43d4d97d29aec7352b565aef8bb251b3cb1ce37d92d034e0688e9 SHA512 a9c2c9ccc846fd73d12fe9120ad1fb224bc35475c7332379a9cc67a7889677ddb1c577489d3a1aeae24e98b397b321823010c20ab3aca172839b2ea1fdc89da8
+DIST sha2-0.9.1.crate 19434 BLAKE2B 6f0d0bdb0e6d856faabda3380b1df78046069c6b884fb0bb4566966cebff9e160362b67a68a4234d5b09b7df573d8c97037dabcc0ab1d98a06bc7ac2d2f2df8d SHA512 451b44acbd6671e0038ef886a6f3566f0f028906cfeb97e22a38ff3efda6d01efb5de40b6c7a75e7458620311f68b3fe26a4dd3159d1647b250de8219d334435
 DIST sha3-0.8.2.crate 521118 BLAKE2B 662136b765939af2d358e7d226a02b3cdda50c3c69eb42d77fb7d9fa0a906e2639ee0d024fb9b9c8062dea57d9db012733ccb5513aff914c698d9a25ea0ea6e2 SHA512 0719e0dce29367f821ffcde75e4af69788dacc9421fcdd08c604f92c12c0dcded8ca75eedc9407cf09cf2d8d91ebd25a21a4ff2e2862484169753791fe654dc6
+DIST sha3-0.9.1.crate 523403 BLAKE2B 414ea8c45bb1d2d343dca750f61cd718f73792291ca82b9f0f55f9940e72974c5677697ce1fadd008122b1d5a08bb983f2692a07ab425fb32f20e49780429457 SHA512 ddf6d67233fcda103ce4e734bb92ff1cc7f2e66ddb630646234c81d3c2facfd19549b0601c77d6f6a5843803de353ec51e77e4b5a1f836cb74203d053816fc47
+DIST signature-1.2.2.crate 10190 BLAKE2B cb9127622f0d6b783e4663bc4ac9fb14b28c8044cbda77a469c0ecd41f09fd91ef8fa841abbd5bccef9c81c3aff0ad2914616df089832b3ff5d4f5b905deee8b SHA512 7df5259951ae9de606ad3881ebd68a9f248249d0175f5fab072a6ba8f42b475bb53060bfa62f3f0bb5407e7102bd597ae29aaff11618b8d4eaf776d292738cfe
+DIST simple_asn1-0.4.1.crate 15752 BLAKE2B 99694bf4598b2039b69058a4fed0d790e4e22ec0ca82920d202bdd1405eca0d6cef6ab660ee0d48c68466f4583c3926ba20171b8c34012df52a041df2a1630af SHA512 37211608915e6ab2408ea91fa937f93962b621bb89c1eada6a06485fbe83cfc930a116464729878f42610ad4d9d21bb1494916f71290257ddc88441317bd0ffe
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
+DIST smallvec-1.4.2.crate 26109 BLAKE2B 7227afe12e1430510bed73e4a97c512d3c7062bc9cdc05024ef5ab4fd1bd66ae0ca74549f8e5f509e9382c33dec2094e3529dc71d8c3ee3fc5102d00a5667c59 SHA512 5fa8ca2bd49dcf23c5f2c241b69811ff92bcca30b9687c3796cd4d4676450640cf5ab15745fd0df07993db42d12e2d4022fc395c55e5464b12ad6a1b3f7f75d5
 DIST socket2-0.3.12.crate 29253 BLAKE2B 0b5c48c90b45ddc6e98e2a9437f239e681acd1431684ad47a9386d437d3aa2fccbb7190ed601a6f3dae65715f1056a211004a071b0f6e71be8761165e18e2660 SHA512 b39014c4c48d0aead812d9310651f459654314163e9f7d059801ee6e56ee116eacb912738b1dd58b5b979997c7334811161257e9b7a024299a2422808445d6ad
+DIST socket2-0.3.15.crate 29282 BLAKE2B 9ebbdd90073120d0457469907b02ac15cdc1805114fee8475b7be23478ed0215dbbae4506219d95b073f56f668e5b6b808f262da5c9ebae1ddce496166104fdd SHA512 dcd2ba06911d56ceb6859cd4053d8d9d32d485c71af86978dab0d4fd53c96e486c8729f93842711e8e9f2b0f8f4604c904c5ef2426c96660dbc05b3bed237d64
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST stream-cipher-0.3.2.crate 8079 BLAKE2B aa122f6a63467ec0cdb0033eb90fbc99c3d2ae8d4335399708e2bfb179b1900c399a636c053e9c7a182b046b8f303ffe4fc77ab71b1d5220045219c6f5a4fc4a SHA512 e9e891403667cd739677f1966aedde06740adf20af51dad93dc4df1ab7eda2f522084ff0a16c15dc25202d9d31250b99e374548d1dd188eb4e43240d777b994b
+DIST stream-cipher-0.7.1.crate 10895 BLAKE2B 4d43e688d3f5907816a8901b61a1de6ded72dd876e7f6048095d35b1a1ebefdf0c0b5ee825772aad72d4a13f37f28b1e94a9d4e56a445bfc79622751090e45d3 SHA512 4e1393f41443d8d958300df51b82c863f65ade33b598a2c22949fda854c65826ab74688af96f69917911bbea8d3fb917ed9e05440df0df3bb9eb1ce8c9a786d9
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
 DIST subtle-2.2.3.crate 10660 BLAKE2B dc21d61246c2fcf45cc3a47a065906b0b40c833a357125483e4cf3dea5307d0126605f65827f20bdeb5986b85784dcdd5db6100514c328650c314d7b6ebd1f6b SHA512 00aaaa95401cf10a198d2169a245289bc015b2c494ab945adaf7d3b42495583931b96fbf85a034bc40f325d21734bd5914aa5065aa289a7d319d7daecd5bae5c
+DIST subtle-2.3.0.crate 11096 BLAKE2B 02910abc8afab86a2a0931b7bc452ad1d0d0f1ddc99dac6595af3020fbfd2af6b1847afc631cf0f9766826a1e7ff0f5c8078300bf45b63512e21e37ec5739baf SHA512 80c61e908a94c449a77ba412531496c089da3a2a583017f05b55bfd1e8eaca215db2358222ca06696d0bbd7a79027dca8fb4031f63df314fad646ae10c6d55a7
 DIST syn-1.0.33.crate 204845 BLAKE2B acde40a1eb59a78ef17afd46fbc5dd3710db4a1fab1d2ca6159bfb1ab3e3ee4182818284ed6a78f6babb539312dfd46eb43dc62842063db953cedc65cd307ba6 SHA512 82408aea39c376825b977d54ea339661cf54664358637e5caaf8efaa7d08e03385b160b3317060c27662a621ab5752bd761cbc416165d1c2cccf28985d73db51
+DIST syn-1.0.45.crate 225587 BLAKE2B f8276bfc5a92edce21fafc3c1459465b03fd28c29e6bebc00a61fe7dfb2e4a10586faee197cc58ddc7e352024a7fc1046176c2a789ebb272be6688745555f004 SHA512 33b7200491854ded454e4768a1dbc823f26d63ec37ff3f60ef62d4171e44da801033fb4f9bd08a8c3801625059e3db790082d8724315fcf8abbce87dbfb304fc
 DIST synstructure-0.12.4.crate 18105 BLAKE2B 8e7efdfa8681da8473903aa22e8cc55abcede012b29a91d65076042c89a21048b44b774ca5c3f788222dd32fa634ac20f58ce241eff610498cac19f659280d29 SHA512 ab3024644719c4afc9c06a4d3c499fd4934c104409d38197a46d62c9ce30414f88b3e7bcdd7f245cfd207489fb54ba41e5cfc1db94b0dd12fb01e9c00c861c47
 DIST sys-info-0.6.1.crate 14216 BLAKE2B 3ec8023c8ab62540f85df37bf2b689231dfc187079e643425375d2e2e89c187770f77b451ced1c427354357685fd3bfbc9c1fe64da262de735f1207dc92f17df SHA512 225ae4b703bdf252abc92119acb6d555bdb5985e53e973a044f8d14e38881a9e6f1ff42019d3eaa74ad92d4ba0a8f8a5bb7ef25fb07e823df005317db8453af5
 DIST tar-0.4.29.crate 44638 BLAKE2B 2769171e5e83c181685b4ccf55a0e7a14b322e63f6ad4e6cb5197c31f70c3a8b5e9a9049aefcb675ec572c8c3864340efb4dd6192020450e40458265e39556af SHA512 9d750161fefb077edf0c27e5eaf5cb7a6b65ddf8a0ad509e497799cf82f3315fdabe233baa73df26141fdcb52fffa6ed5d194775ee7671d80d3556acfbbd9218
+DIST tar-0.4.30.crate 45211 BLAKE2B 9c1e3b2b7526c48854a4c4955f1d0cd79599a55fedd4a351249761007ab2c57da98a492f457558242a25dfea306160ed1dc2fabe66e4bfca42d5793f21ce5b68 SHA512 7cc921057a8b1a38e3eb03966313ea39812ad36b5694f383c9ea69ded9813ce3ff1c7bb0f3fc596d63630279722365a7ea0cdd034bc2cfeaa3056ff83d6201b0
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
 DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thiserror-1.0.20.crate 15950 BLAKE2B 747ff4ccdaddbbcc80225164b203cacc8669796e3c1515db9011f053486ce8d77a4560ae58756641fde7465ae6c818ddbb5b60641d1e5ae288ddcc549eef1848 SHA512 7f8e201f8d173112c7009fffa79e6d2bda5614cfb0439b81a9a990b777261de792d7e7750d75f7638bd58e6d72d183cffbada902595f425f037d6df04c0528a9
+DIST thiserror-1.0.21.crate 16187 BLAKE2B 9599c8410f9a8c837d5e3a7eb1656e29dcb6c0b6edf4a09312caa01bf11613cc23d9c2aded04e3233c5abac97e7e6e4e46fa2f6311b93edd332a1dd5036b7760 SHA512 440c4e7486bbe813b8840a215859da9e1c8f95383fb894e5ad445c86d40005c62738aca14ba761636c17c5db206b71bc40a915035b2dd9023f8b5eff5e970e99
 DIST thiserror-impl-1.0.20.crate 13197 BLAKE2B f7da61d0dea4864bc3fbccad178b67f85223ab9f9529c118b07229d55a2568f23888041f2cd813efe51dacf8e01de62397092f56c43c640ba97a32dae2b7cd6d SHA512 3ca4dbdeff76c12c5a716d811891ce14bb16013749a45b8d8fae9cdc599e304065665dab051713d7e8e5bd2d2485ff9fa0904ca3cb5bf9e19f2cf66b42f10209
+DIST thiserror-impl-1.0.21.crate 13199 BLAKE2B 6f694e1282bfe3c5aba54b523afa25feee2a356d61d5031de046822fc9df1ae3942126ca7841f7ba8ddad0949e069a2e8be888099bde95576e2d01616b69bccc SHA512 70322106df1df17affca80481672210261a6344c484f4338f7470226914721e8a2157ea875744d4652b0ea1575dd4992a6d366a2da0524b2c84ce321a3badf45
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST tinyvec-0.3.3.crate 17860 BLAKE2B d3665da9e5e2369bbd68c84827ce13cd1c0afa07b8cf689b04a62e24e5bafe41e8f32b136e048ce85aad324c22ca68fb43995a5445092d1f331379366f71cb03 SHA512 41200e022e66624b45e186a5ef6e7cc05dc3e2fd28d332deb689699b17bb85ecd0d960809e4ea2a08ac1ebeb5f2fcf364f4f9626d297f23169476c8be9dc1557
+DIST tinyvec-0.3.4.crate 17586 BLAKE2B 2173653c5433ba8fda3afb7e88e9065e2b5cbae6b25753eb306423e8b0ac694074d678bc50a53b2ccc228a8e8b4d06de2ddeb63f0adf057feaff8a998820eb5b SHA512 91613078d89456fa233ee2fa3309f6b2b8d490771b62fdcc027336bfb20ee5fa3d8d3dec446ab397b5974127567d4f62186c6eea45bd9c767719bb770101ab2c
 DIST tokio-0.2.21.crate 391113 BLAKE2B 685b6786f329e32369d3e5636f7bc9da6a8b164b7287e96e048255cfdf21c25f55f4800eb0e6f6e3823d5654a38eb17d4b12d817fb490dd9664534cfaab924c0 SHA512 6756cf5490ea3d0993fe8a9d0ae70c2629cb2c77214fb39f635ee799496699662391745de7f3c49b0befd53fb238c274764ca23d7f3a1f278ed7d1eda34ae4bf
+DIST tokio-0.2.22.crate 400639 BLAKE2B ec18c498086c486cace708f9f2014dba24b1a8dca7f7fd9c57edea741cd94aa962a9bf05b9f964000c82ae69a7ed4b4b5f31005c2962a5776bce681c79d85a47 SHA512 e81ffd9dc23d83a3383c944b65636a36f578ea9d5257769017228eb3c413e0991fbec90e69a43b84e8349c4628e519947136a627152a4ef92cece9eb5d64dd24
+DIST tokio-socks-0.2.2.crate 16371 BLAKE2B 0dbeea7a865f81c3170b7b3b5b3de328c39fc0cf2def463eba6eba6b3fb456529b69b34ad4bb60b6f0bc05ca85ef2ce48c3039e63553accb6fa3be31fa1a7be8 SHA512 7195be57278de05ae56f4ec9cb65ee355719f1337837738136113b71ed2ee231983e33395996ee7bc8fd2bab4699b93bdf4ee62cc1547759ac1d611a3321791c
 DIST tokio-tls-0.3.1.crate 22517 BLAKE2B 05be1ca4abb345fc859677bb1b4e49064324ef7858c5bff7301b4a5110e4a6339857f5d85037bbd66b433a3c2439eb3c15edc63648fe04df2da9bfe1c93b8e08 SHA512 46ac00d839415a8dc9d9709967414e3812606a23c2c1e0e9dc9aa6aff70b24afb44e4c5a231d0d857ea8d06d07c254c97a459713122006cf1afbc6d4f7b7b6dd
 DIST tokio-util-0.3.1.crate 27233 BLAKE2B 96e43dd3f6f6209a6436e6ef3a40739f44507312b02a83f0316c7500dd6a59b5a71af005a98818d9b1db0e33aed4a9330e4cf955855925c8a428132762985db2 SHA512 301a5d9a8a9537653e17d3360dc27d41c95aa28bcda3e0815923dca0ac735071b01b9fc8c1d53e826e0cd1e6e5f98cc233f1e9dea906ba06c6b5192608ae7ae8
 DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
+DIST toml-0.5.7.crate 54372 BLAKE2B 8147ee2e9412cb79f00585cc54b06943ab3fe3e852b4b033fb06ef13122b07216c0b2f7c84aa548f9b0cb11c2190da3c69ed8b91eacfbe1519a5d94398b358b9 SHA512 5537a103d2329feb55a470f39962d6484da515c2727d379be108a778c8fcc551065942133ad9f943f0fe96847a9d0dcbce009cd0ce1ef3df355e34fb1439dc77
 DIST tower-service-0.3.0.crate 5321 BLAKE2B 267a8276baf4dd10c168f6db5b206ab9433be45532bd7fc5389952b3492e104fbe5301857f20044d7ba0c1af9572178d51a6f3dd723a6034a25e0c3dfd48e9a8 SHA512 9b46928c2ac13c738e56a1c4e9fdb512f17aa8f4e95669ae4fb9a9f9a4b094114d7869b923186779f87b45b2915ecf778f95dba415b6d4b2e6c20c34efdc6a6b
+DIST tracing-0.1.21.crate 65404 BLAKE2B 80f66cf67e7e1eb583ab0727a2d1b66fcfc9ceabda2b43623d09eef3514ef6ebd9f2a90011719c43285e6ed2b09ce78aafe288c2df428bd0a32d6bbaa18b258e SHA512 9310c0a26670ccc99dd330bf7f9c4e1f87c11c5b11fdc25d05b237eac457f37a2ef3136978945b2126eb37c54fc750466a7195e8c5fe727445fe46188b8fd3ae
+DIST tracing-core-0.1.17.crate 47774 BLAKE2B 6c13692d90ed3f84110c15a1834b5ca527cd950dd9a141b06ac2632bee718b67e46615e26567f58e4c3129b4d38abcfff515c6420c906ed4f957bacdeaadada8 SHA512 202fa2bf6999d1568f4ac4d92a2d29b3ea79b5d93bb57347927eda60c8d5b430b366889d45a4d5d22d4e1c46e62ffcc39b3091a91f79a26fd6b7827fcd7c230d
 DIST try-lock-0.2.2.crate 3638 BLAKE2B fdd33b9760b12db5c90dd9c34980e62d061e1a691eab760ed80dafdcd1ae82055b4ccac7313babb43dc9f2f38d3cac3bbf3f586b26f407fbd035c5c3dfca168d SHA512 aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330
+DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
 DIST try_from-0.3.2.crate 4264 BLAKE2B 13a4f1698e711981c183478b4bd4138cc90e8451000e56c965691e7d0be96e3cd7ae78aca891ae4a0d6726ef9a1d3beb26e4a4c18042b409a232a467ac36c11a SHA512 a619b8fefaf8c25037f1e2e7f8e64506144c8a7080ad930138fc3c4a2541dc7fc83ffd9c9a8c762ddd57028072cfd8dcb9db0c590e3ac30a4863f8d4fbb63739
 DIST twofish-0.2.0.crate 10280 BLAKE2B c035224c8ea88e487dc987667739372a5acae6d9617e12b1fb97a809021a198dbc4066a211c23dea432eaed6d16de674d1e39ff0be96bd0727151961d390f7a9 SHA512 c89059ae23064130c03470997e27de5c129c8fac2cba476a96eee6c22314aab2a9f6c2bf1339709168a4e643c749b2a551a39dd024e8be90ae214b6d5737bd91
+DIST twofish-0.4.0.crate 11490 BLAKE2B 5af970a08b8e7bee4f5fa0776a16c43c20614c9d2f327775ae6ab98dabe62891a7cad56924c57b980287e41e55394ffea3885a6e12b90b4981e619a520aee729 SHA512 da7db8c86fc36f66caaf05df2152d7d2f5556d47ee6d18e25420b3876dc293a561e5f85fdec5c13938df2aa55c1c6d3d2fc45b00ae0d15aa6ce057dcc003b8c4
 DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
+DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
 DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141
@@ -212,14 +348,22 @@ DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
+DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasm-bindgen-0.2.63.crate 154967 BLAKE2B dd18681df3428776d2e9f137f9bc76b5a322b4417daf9ed6eb56f2437c46fdd4b7039b2be0496d38394ec4fc9ee3c20e4f5785b49154fd039526a69869d17708 SHA512 cb9e652c6c60608ab283b74726781291d72dd215c69c73556a3e09df225131d1f56c6264f65d64af6ca696de2ed9fa87cc53fa7a60dd5c0f938d7f10ffd44b64
+DIST wasm-bindgen-0.2.68.crate 159094 BLAKE2B eb7fa3c2f80e5ab7c0d8e99b11bfc025fd32c8347b9baee9f947570a85426dcdadd052248af7a0ab17bdfbe494f71037fa1980fc875d84c089b70a80d0321bce SHA512 a3e877a43242a35518b84852ac71f3cd6c9ca558234fc23bece38780a0abcbf9e7c6d07e20e81c1f6641835ed3b55dff8245fb75901205b0b5658f4e3b0c05ea
 DIST wasm-bindgen-backend-0.2.63.crate 23257 BLAKE2B 5d72962bab99da8040df4cc709fcff668c06b52b1048335508d011feae90db17977ac7ba7c42c5766c590df03c27817673f762f3aab4b49c50f97c2a844321ef SHA512 0f409e7772a3d9e4408f0c1b82f4ea09319f58365e05003d8070705e773f675fb6b536e883204e548916b6558add6c764bf090234d9cffebea4091fd6b6ab120
+DIST wasm-bindgen-backend-0.2.68.crate 23522 BLAKE2B ad87e1cbfe42d6b3f6c14f793dcec31fb0f9418454e0870a3951bf5f6b0eb9f39e5363129fbbdf986aa50e1fb2c13b03bbd9e21364204ace72460856fcfa7610 SHA512 aae99cefabc91417bda499b4fe8f136a81ffd44d5122f0c13ca5711eae26f2f8b16ef55c18dd4fd3f0e71edfff8610379adc458f978eaab057671b520de9d564
 DIST wasm-bindgen-futures-0.4.13.crate 13682 BLAKE2B 6bccd133d90600eb3542303ed5a25fd757f1c481ef1680d62ce5d61d23ae24aca43d03facd059602f2b4e0ea6ae71b096dad902c12c3f208be2fabba7f698c67 SHA512 0ca264b86b33812931264875762ed54a0cf53347255258e31032a2727923251f3e922bb5ad22bc51b785e0cf8c4dd7d920297f7e13b6ec1015e950ab6bafabff
+DIST wasm-bindgen-futures-0.4.18.crate 13690 BLAKE2B 26d4ab68627911c26b96e1d55d715ef6d732a7286ba4caf603a87561f52061e4a29db69898452e63a4fefa94c5aff3cb8e739b8980fbe6b3ebffaabd1339f134 SHA512 2290fcebb33d5ca87ade68e39217e43a0b669f30fd63651e8dbd658d26a8666aace2fa43918ba879700aee49cf9014fe2c78af8526d7272d96890050b188fe19
 DIST wasm-bindgen-macro-0.2.63.crate 11598 BLAKE2B 7444d9e3998974ce1973991fe98875b7ed99df35c8680a6cf15c4c02fd6a88319e48002b7f50adf70c33ceaeff2bf7cc4c8c91f31625195130d9c2e1b5df9cec SHA512 49f6363b00f7d951315853a6cb0003725e1ee250579c115c6f533153f8719f4ce1be2c630b229a2a3e2953b61c4f5abf76596714acf112e33d1e0c2ec48e9400
+DIST wasm-bindgen-macro-0.2.68.crate 11630 BLAKE2B 407ec70043b1b6e7f454ac9d986d6df98ae19c9ab8ada98f4f968520b7cd75886cdeeeb739d61615bcf0d6ca3a757ba618f0ed9abc76308c461f159ac05ec61c SHA512 c70f536072ce9bcb109ea762c6235aea7eafd37eb3faad1b50184b733d09417b02f6f75b5c29fa46691b75b449316a039b79c630387f04903f6304453f98e772
 DIST wasm-bindgen-macro-support-0.2.63.crate 17497 BLAKE2B e8fb8ac1e66ad1de5deec16f46d2212b25bbd9b49b0ac2945d30621c5997619cadd1e7f16debc3a84a07a27b83453315a62335010687421f7b58f5c82d88dcfe SHA512 a2bdf1d4aa4232466a492e42bbdd86621378749495732ee366e5d2c05c4450aba5d0b34370aeca0d8dbc40c2024d9b19b912998199ab11d261a8b545f4a04bcd
+DIST wasm-bindgen-macro-support-0.2.68.crate 17793 BLAKE2B 619c0484ce4f97742972f1f6fed67643f570df3bad436cd2a93c5cd7477a8208082cafdad87e01caa1ba752bb200e65c61e49136e8037a9c52b9f06ca0c4ba9c SHA512 53d3e483a7df0a816eba308e5a9a736b5e812da9778889686994ed964888b4bb9a8b12cea448b1c68607e6a8b10596f8a81f4c85dc1311667cea5f445e7bb993
 DIST wasm-bindgen-shared-0.2.63.crate 6738 BLAKE2B 13d3cde27d33a28ffa17497089f5af5faa22f2a18557c2aa25ab39d0e0385660788b8fc47dce9ac7c419eaf213aae96099c2332f077a6b31c38f5d519579a841 SHA512 095653acafded328e6a7c0d71e6c989a2effcc497c3826c26dcfec45b4f5ec6c2907e06d30dd32ef780b60c01ddaea8f001477142ffb3aacd6a9c59c6f2f5fcc
+DIST wasm-bindgen-shared-0.2.68.crate 6725 BLAKE2B 891ce0bf742bb32be1549c5b8822952f5cdd15ddd73aed164f753fef211c4087269fc3a859950045bf1e895e255b6f09b6788a7a5d43387365079f106580bf90 SHA512 cf161076d07dd7e91790bb1f773a6f53cf31cc0f9ffe7a650c98d2c6c98d02ba8d1b32fc2aa15128f739c86f49baf206444516c3f8b8df82238eabb72032be0f
 DIST web-sys-0.3.40.crate 628597 BLAKE2B 1c1fe74bdc6938241ab4280817c2d7bcdb185681add3f2a8d6edb4ec1d111b1f485203530dbb3f2f9c25ad8ab3609aa667551280ae7928ac73c154f5ca81ead4 SHA512 162e55a340fec36490267503f8278584b6bf9c10d920dfe3e96bc86048c07f9a5e02ff2be796ebfeb5996935da4ba2466e9acddd92c8de1ae70c1b00c47bbebf
+DIST web-sys-0.3.45.crate 630993 BLAKE2B a5a72bf3785902a65a7fd65b53d696b491e9438ba4dd78d4e97f3c3d62df4144716ca09822e074f27ae5506765c7c2d547a110ccaf5c4c214da6b5a4816425b8 SHA512 d208e2271f59691b13b94b952dbce966f54ca180d09c6725964541c00684787a3610623294f81032cc931273ac655dc6163b23fda736b603ff327abd603fbfc8
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
@@ -230,10 +374,14 @@ DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779c
 DIST winreg-0.7.0.crate 21225 BLAKE2B 5841db683dc0aa8b92de8ec43100403b029c8d3e544adcaab030d998e5af4644ea176ac0bcd97141d137450a7bd761a5291405202c445a326da7d4f240686230 SHA512 a0b7a2d239e30cea89a863b879831bc32b5f2988ef3f0586ddadda48827cafc82d3602d2f8df3c47dc1e80537149a1ca1dc1506f9fbf960d9ba081dff1bac731
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST x25519-dalek-0.6.0.crate 83928 BLAKE2B cf8a12b61d65451243a03c82686c19a0eceae9cfcc41c2fda4ddd29aec9ae1481a23514f88914ba32ad77ac961d9b80a210bb20ab12828e1008ee1911b32819d SHA512 dca6f29455bfabbc433caf9b16963a2c0e9ef8d719f759af8e09cd53d1f7e5d51489439d6b0067b10f0d60b3ae9d5f88497905bd2a130ae5cad41f777bc15bee
+DIST x25519-dalek-1.1.0.crate 84717 BLAKE2B 7583aa0c4443ece2e15ee4f917998f20f758326e59b3636897bbe1649af8ef0f587171f7bc52956fd742a03f129fc609fdbc893c2e1ff78a20d43f17bc699afc SHA512 e2a44dd4e277e73936a03099e5882c5a8a849c753b74f999fe6e7c9c107809b27bf4d3430c28bc697200de464ae3a0829e5423f5d0da31e0300349194d51f937
 DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
 DIST xz2-0.1.6.crate 24512 BLAKE2B 47f260f4ce920bf8eff1446981672c9d877b4e5908fe20053ed15419e3cebd540fcedecf71ace32b25bfc5d6731092a565a2a8ac303ed21ae47460c1b3414833 SHA512 c0880b2bbf890e962b27efda6c513d1626332ff400dd08a9126a6e1d1375e0d0e3bf243b10df78e2397b611d0365b6526d96974c4ff332bb81edba71b6ebc811
 DIST zeroize-1.1.0.crate 10316 BLAKE2B d5907adacd54a8fee639faa230ce98d8f9f2e1a68d22c824f475f0ca84d621e6d5c21e0aac676c5979b8529de556d45e5cf8c434ad3d8f99e9e1b2f9872919c8 SHA512 19ebb9515b7c8bc384c180e4ec8b6f77dc84fbc49a3690af972918b2ca73695b935d4673ff17ec8ae95a1824e5b261838e656e7939f10e3b14b3b984180aecbd
+DIST zeroize-1.1.1.crate 15108 BLAKE2B 28f809ade86fc05d387e265bf76475da1c44d80e706301a8c899629589ea54370959b221d550b810e78ab6e52b9237f1030efb161e1cb6e892bd2cce5fe8c295 SHA512 748c8113abb0d70700a600088a51bf09620562db57dfbd5596af31d3a43b8fb587401755c4d9da689fb1443384492684eeb5acfc8c4db2d60b93f7214791f29b
 DIST zeroize_derive-1.0.0.crate 4247 BLAKE2B 2e96c44ca630eccab5e49f4426bbecfcf83318ecfefdfce2ecf877dbde94a93c4fc44ca60c4cf2950e5108ccc1b4474e40be29edeace558c74dab8b12f9f84c5 SHA512 495979256548c6dc0e39d7f08d752772f6358214a2704328ec839a1872a59a62244b8bc700cf20830091ad4f02298dc8f571f2f17253f95c1ae99b38fb0b9445
+DIST zeroize_derive-1.0.1.crate 8047 BLAKE2B c43d99d7f80d104ec43708742d2c13080a3b96d0b8ffac099f86c82bce33d263313a42ebec42ed5dbeaeac397d1717e6cf089980dd7934b1efc7228b737a5f21 SHA512 cbb7fe8d9ecb38c0f6fd11e491afa289cc9d8719f2460f4569816d7d55ec17fc88aa9a167aafb83809e2122481e016039b055e3bc4edfdeaf009fc0d65212dc7
 EBUILD rustup-1.22.1-r2.ebuild 6247 BLAKE2B cf381c4df7fe47ebe55f8291591d05ecd2e1720bdad88a4c6e293ab90bc0936619a476ab5d8661f0cea40fce6d255e1016b99e92281d577afa2cd0b7ce68f4fc SHA512 7614fc73f5b8045718e1bfd4625192100f1b36645153a2e2fc7de5e3b73b0d99766114e4d5c9ffce533b0d8440faebd98f782f9ae889f85afc3bfc1e57e100e3
+EBUILD rustup-1.23.0.ebuild 6919 BLAKE2B 41bcaf3ac78ca33a93ece9b8294cf4a3764d9b94749d47683944b3e6bbe239bd59030cdd4392714ef06a9424e478c4626ee24ed2262a83abc2601edd7e745c32 SHA512 db96541f722975e2e2f4f6925ba408d0ff3a1d7119a6a9c1f563e0928d05eb137d4c3b1c694f8b2d695e3a5ee739b27af92838ee33a63dc9671d1afb75c65619
 EBUILD rustup-9999.ebuild 2000 BLAKE2B 13c78fe9644a8646d11545f4d8ab1f613b94b2f448dbfcb65a0d0afa40119dbc562c00f561370411f5cbef6cb062636aa853546d1b4fde69bfa7aaadd54c7dee SHA512 6167c62a6bf20dea007775c994c00ceedecb60f6f199703c2c73d502ddb697790c7fc28d45f5083794f590e41f133a96d05befc1fc133ecbf7b828ea9ddefce7
 MISC metadata.xml 356 BLAKE2B e17235a7b0ea9156af7ba204f1693bffd96a42926df5241e158e67616a60101d5a554d882e3aec14eb41a53b411a762cb50ceae076e44bab6e0e361eee83c569 SHA512 dc4ec000b7f6d769dabb37210fd9515917feba7224cbd1db27013b0e0f27824cdf03c7310d0f64dd3a099bdc33fc65c29648e860011c98fc6c8e9b374a17e337
diff --git a/dev-util/rustup/rustup-1.23.0.ebuild b/dev-util/rustup/rustup-1.23.0.ebuild
new file mode 100644
index 000000000000..09fced7da85d
--- /dev/null
+++ b/dev-util/rustup/rustup-1.23.0.ebuild
@@ -0,0 +1,357 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+addr2line-0.13.0
+adler-0.2.3
+aes-0.5.0
+aesni-0.8.0
+aes-soft-0.5.0
+aho-corasick-0.7.14
+ansi_term-0.11.0
+anyhow-1.0.33
+async-compression-0.3.5
+atty-0.2.14
+autocfg-0.1.7
+autocfg-1.0.1
+backtrace-0.3.53
+base64-0.12.3
+bitfield-0.13.2
+bitflags-1.2.1
+block-buffer-0.7.3
+block-buffer-0.9.0
+block-cipher-0.8.0
+block-modes-0.6.1
+block-padding-0.1.5
+block-padding-0.2.1
+blowfish-0.6.0
+buf_redux-0.8.4
+bumpalo-3.4.0
+byteorder-1.3.4
+bytes-0.4.12
+bytes-0.5.6
+byte-tools-0.3.1
+cast5-0.8.0
+cc-1.0.61
+cfb-mode-0.5.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+chrono-0.4.19
+circular-0.3.0
+clap-2.33.3
+clear_on_drop-0.2.4
+core-foundation-0.7.0
+core-foundation-sys-0.7.0
+cpuid-bool-0.1.2
+crc24-0.1.6
+crc32fast-1.2.0
+crossbeam-channel-0.4.4
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-utils-0.7.2
+curl-0.4.34
+curl-sys-0.4.38+curl-7.73.0
+curve25519-dalek-3.0.0
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+derive_builder-0.9.0
+derive_builder_core-0.9.0
+des-0.5.0
+digest-0.8.1
+digest-0.9.0
+dtoa-0.4.6
+ed25519-1.0.3
+ed25519-dalek-1.0.1
+effective-limits-0.5.2
+either-1.6.1
+encoding_rs-0.8.24
+env_proxy-0.4.1
+error-chain-0.12.4
+fake-simd-0.1.2
+filetime-0.2.12
+flate2-1.0.18
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.3.6
+futures-channel-0.3.6
+futures-core-0.3.6
+futures-executor-0.3.6
+futures-io-0.3.6
+futures-macro-0.3.6
+futures-sink-0.3.6
+futures-task-0.3.6
+futures-util-0.3.6
+generic-array-0.12.3
+generic-array-0.14.4
+getrandom-0.1.15
+gimli-0.22.0
+git-testament-0.1.9
+git-testament-derive-0.1.10
+h2-0.2.6
+hashbrown-0.9.1
+hermit-abi-0.1.17
+hex-0.4.2
+http-0.2.1
+httparse-1.3.4
+http-body-0.3.1
+httpdate-0.3.2
+hyper-0.13.8
+hyper-tls-0.4.3
+ident_case-1.0.1
+idna-0.2.0
+indexmap-1.6.0
+iovec-0.1.4
+ipnet-2.3.0
+itoa-0.4.6
+js-sys-0.3.45
+keccak-0.1.0
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.79
+libm-0.2.1
+libz-sys-1.1.2
+log-0.4.11
+lzma-sys-0.1.17
+maplit-1.0.2
+matches-0.1.8
+maybe-uninit-2.0.0
+md-5-0.9.1
+memchr-2.3.3
+memoffset-0.5.6
+mime-0.3.16
+mime_guess-2.0.3
+miniz_oxide-0.4.3
+mio-0.6.22
+miow-0.2.1
+native-tls-0.2.4
+net2-0.2.35
+nom-4.2.3
+num-bigint-0.2.6
+num-bigint-dig-0.6.0
+num_cpus-1.13.0
+num-derive-0.3.2
+num-integer-0.1.43
+num-iter-0.1.41
+num-traits-0.2.12
+object-0.21.1
+once_cell-1.4.1
+opaque-debug-0.2.3
+opaque-debug-0.3.0
+opener-0.4.1
+openssl-0.10.30
+openssl-probe-0.1.2
+openssl-src-111.12.0+1.1.1h
+openssl-sys-0.9.58
+pem-0.8.1
+percent-encoding-2.1.0
+pest-2.1.3
+pest_derive-2.1.0
+pest_generator-2.1.3
+pest_meta-2.1.3
+pgp-0.7.1
+pin-project-0.4.27
+pin-project-internal-0.4.27
+pin-project-lite-0.1.10
+pin-utils-0.1.0
+pkg-config-0.3.19
+ppv-lite86-0.2.9
+proc-macro2-1.0.24
+proc-macro-hack-0.5.18
+proc-macro-nested-0.1.6
+pulldown-cmark-0.8.0
+quote-1.0.7
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+rayon-1.4.1
+rayon-core-1.8.1
+redox_syscall-0.1.57
+regex-1.4.1
+regex-syntax-0.6.20
+remove_dir_all-0.5.3
+remove_dir_all-0.6.1
+reqwest-0.10.8
+retry-1.1.0
+ripemd160-0.9.1
+rsa-0.3.0
+rs_tracing-1.0.1
+rustc-demangle-0.1.17
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+schannel-0.1.19
+scopeguard-1.1.0
+security-framework-0.4.4
+security-framework-sys-0.4.3
+semver-0.11.0
+semver-parser-0.10.0
+serde-1.0.117
+serde_derive-1.0.117
+serde_json-1.0.59
+serde_urlencoded-0.6.1
+sha-1-0.8.2
+sha-1-0.9.1
+sha2-0.9.1
+sha3-0.9.1
+signature-1.2.2
+simple_asn1-0.4.1
+slab-0.4.2
+smallvec-1.4.2
+socket2-0.3.15
+spin-0.5.2
+stream-cipher-0.7.1
+strsim-0.10.0
+strsim-0.8.0
+strsim-0.9.3
+subtle-2.3.0
+syn-1.0.45
+synstructure-0.12.4
+sys-info-0.6.1
+tar-0.4.30
+tempfile-3.1.0
+term-0.5.1
+textwrap-0.11.0
+thiserror-1.0.21
+thiserror-impl-1.0.21
+thread_local-1.0.1
+threadpool-1.8.1
+time-0.1.44
+tinyvec-0.3.4
+tokio-0.2.22
+tokio-socks-0.2.2
+tokio-tls-0.3.1
+tokio-util-0.3.1
+toml-0.5.7
+tower-service-0.3.0
+tracing-0.1.21
+tracing-core-0.1.17
+try_from-0.3.2
+try-lock-0.2.3
+twofish-0.4.0
+typenum-1.12.0
+ucd-trie-0.1.3
+unicase-2.6.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.13
+unicode-width-0.1.8
+unicode-xid-0.2.1
+url-2.1.1
+vcpkg-0.2.10
+vec_map-0.8.2
+version_check-0.1.5
+version_check-0.9.2
+wait-timeout-0.2.0
+walkdir-2.3.1
+want-0.3.0
+wasi-0.10.0+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+wasm-bindgen-0.2.68
+wasm-bindgen-backend-0.2.68
+wasm-bindgen-futures-0.4.18
+wasm-bindgen-macro-0.2.68
+wasm-bindgen-macro-support-0.2.68
+wasm-bindgen-shared-0.2.68
+web-sys-0.3.45
+winapi-0.2.8
+winapi-0.3.9
+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.7.0
+ws2_32-sys-0.2.1
+x25519-dalek-1.1.0
+xattr-0.2.2
+xz2-0.1.6
+zeroize-1.1.1
+zeroize_derive-1.0.1
+"
+
+inherit bash-completion-r1 cargo prefix
+
+DESCRIPTION="Rust toolchain installer"
+HOMEPAGE="https://rust-lang.github.io/rustup/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rust-lang/${PN}.git"
+else
+	HOME_COMMIT="a243ee2fbee6022c57d56f5aa79aefe194eabe53"
+	SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/rbtcollins/home/archive/${HOME_COMMIT}.tar.gz -> home-${HOME_COMMIT}.tar.gz
+		$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	app-arch/xz-utils
+	net-misc/curl:=[http2,ssl]
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/rust"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+# uses network
+RESTRICT="test"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		# patch git dep to use pre-fetched tarball
+		#echo "" >> "${P}/Cargo.toml"
+		#echo '[patch."https://github.com/rbtcollins/home"]' >> "${P}/Cargo.toml"
+		local home_path="home = { path = '"${WORKDIR}/home-${HOME_COMMIT}"' }"
+		sed -i "s@^home =.*@${home_path}@" "${P}/Cargo.toml" || die
+	fi
+}
+
+src_configure() {
+	local myfeatures=( no-self-update )
+	cargo_src_configure
+}
+
+src_compile() {
+	export OPENSSL_NO_VENDOR=true
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+	newbin "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" rustup-init-gentoo
+
+	ln -s "${ED}/usr/bin/rustup-init" rustup || die
+	./rustup completions bash rustup > "${T}/rustup" || die
+	./rustup completions zsh rustup > "${T}/_rustup" || die
+
+	dobashcomp "${T}/rustup"
+
+	insinto /usr/share/zsh/site-functions
+	doins "${T}/_rustup"
+}
+
+pkg_postinst() {
+		einfo "No rustup toolchains installed by default"
+		einfo "eselect activated system rust toolchain can be added to rustup by running"
+		einfo "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
+		einfo "it will create symlinks to system-installed rustup in home directory"
+		einfo "and rustup updates will be managed by portage"
+		einfo "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
+		einfo "before running rustup-init-gentoo"
+}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 5c04191a4dcb..8c359b0afcc8 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 6ca4a4ba0984..a9ea995d1c7f 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,16 +1,12 @@
 AUX ppsspp-1.4-O2.patch 1576 BLAKE2B 5831befac76d1a674c0bf453043c1ac36435c76f04ec5bd95885582c9f44c283232a9dbbea629433629d9fbfd5cc1415f5e0f47c50dbbdb9e834891280e98a49 SHA512 39f18c074e56aa823b223a78b099771257b4a5672a41c6d271cee5b817a2a63d17f57ad9f936da41185dae5b4bf2a94cc62cf92596d94b6e0660f1b05bf9ac2f
-AUX ppsspp-1.4.2-assets-lookup.patch 525 BLAKE2B e0614d010e1708cfdfeba376ece25c6bb121e79dae7243988706a80d6ef022ba52286878c9e7c868bbe23aca6c5182ca1e0c6b5baaa6e4b32e2c79eb4febd10f SHA512 9963aad44ce72e9625cdf816bf58743ab8936d8f1fd3c75ac9ddbda5e179cd71fa4d23321c42ba4d56bd472cc016a62430a0c6d8b84792e2851977a5155cbdb1
-AUX ppsspp-1.5.4-ffmpeg-4.patch 1111 BLAKE2B 22478545e76173b2632a1d33d75b3e4ac883331dcb74178b9aafc85fcf5173d81ffb3c8491ff5be4bef7af10660bb62615f9855a6d6ff0c16878fefb89afc198 SHA512 abfd0a1bcb6bcd7fdd116c5f5b0ff6cb2d342bb4aa5231e2d2cf8466ee704a366c4828733b7698a78611cd3f6ac6d9437d9e2eb777a20db609090466fbbd0af4
-AUX ppsspp-1.5.4-stdint-gcc-10.patch 201 BLAKE2B 828afdc3f761a24a2638fa785c7c05e9a35f2ebd94dfd2dad5609019a5405495a82fe4961ba8bd994ccfc5eb28beacc46b9804a257a829ce03f095bfbc543a57 SHA512 98c0722fe8c9aeb661ec7bbe20380eb549feec85e08c451482d6120e49c5b0cefa97cbc65b381c27a26e4db6d4bc27729eee7f1d2b44f74f4cb2c3496244b001
-DIST ppsspp-1.5.4-assets_lang.tar.gz 347859 BLAKE2B 648915773856a64dafb5d159e0917b4345ff99dba7b7dae4f343ecd81e1d835cb958766ab8928118ae4768564414e3dcceba474e05e99be23d56c9447c59786b SHA512 72983f01c51900fa133ca83d226a5daec78153c9d70fc1ca6233b531f3c5d5da5e307e377560789cecccad7a98ba8f66da104cc4375f51576f90c535dc980b98
-DIST ppsspp-1.5.4-dx9sdk.tar.gz 14582591 BLAKE2B 12a370e262d045bab6f85237160189921e0bc9992726bb60d241c20a5714128995cf110bb5889c530f8cc3497a34645a96ff31b7b61fb3004279f26b15287435 SHA512 2c54b441b0a31f63ecab1bd2ab14254fb2047d35d2765262d43277330a8428fbf4c8848d5f730456a033cf84258f6b60a467213f8339289b3ab83ed7e94c65b7
-DIST ppsspp-1.5.4-ext_SPIRV-Cross.tar.gz 228943 BLAKE2B 0b4ed8a751737bf6fce9fa766f0b8dc0671b49a6adf026c369ebd3776d9d8c23acd08b6d3f41666a6e23410ffb243917a844d9de85e3eca5ce04935421aaca98 SHA512 5fe2f772b571da0627fb9d9c424bea2b4ea1c0563e36ff455ddaf1b92ea3d5ee636e039a0619e0971478ce10e163b45258e9b03d2610c573f74d1cfd08549bb8
-DIST ppsspp-1.5.4-ext_armips.tar.gz 191245 BLAKE2B 8bfeb8828bc2496c0222b22547820f00c5a695dc9469a2ce6b8fe7bc15e72af862a957e632af1829bfdd4cf663a586baa10495896971b9b138780ddc387aae9b SHA512 9ab376b928fadcbff7256ff10d6581e4960e00e48a93f47f7e90b1998022a8d03cadef20880aa020fe6b62e4fa43cf28fc68dc5b10e93b1212fd6788ae493dba
-DIST ppsspp-1.5.4-ext_armips_ext_tinyformat.tar.gz 22284 BLAKE2B d37c35efeb42e3998603127f8758cec29103b5f7700ff465d5234e032822965e9249b6d183dba9962a76bed06abeaf0c40ab701425d1fb4d64ffd83c9987fe8d SHA512 fb063ea9b632c8a9a0203c181830cb2feed9142fcf4d69c11cc0a3e8dcbb3cea51dde6bb351df567b3f105a4da99fd2e72ba3572d3fc0e9a45364f4115d6c3d1
-DIST ppsspp-1.5.4-ext_glslang.tar.gz 1944927 BLAKE2B a9bfae046335f8cba72fc92208fd0370d1808d242c00964c5507ce7d6aab2ad10ef839e8f46c46ba9ac039e11469e26877f89a51843ad035f33b434212a18317 SHA512 333a93707e067ac1d98c69533c2d206675d75aa54195326accf33e8401ac2fb412d2e2525b0ee1313f141872aa6ea430ae5424e8712483c59f77dc3adbcb4f59
-DIST ppsspp-1.5.4-ffmpeg.tar.gz 311610961 BLAKE2B e01b203ff1f230a27b02dab0596dedbc26e049190fa1607903b70023865c50de4fb7361de33c1bd1c5de305124ea02f2ba9ac854bf2f40f3e79259663cdfa4ec SHA512 d4bdb3c5a13bc64d7b22e38b416355d302a4401a1d8f6bd57a4d8502823dc9a2987df92b8e781ddab6de8ded9b59b268ef1b33f8f43a0be7b1c57d4ffbee6871
-DIST ppsspp-1.5.4-pspautotests.tar.gz 36005395 BLAKE2B fa92d1acb0adfecb23f55132c4e85843c3c04c73e4bc8cfb054cfa8e0b67fe1c03c4a83032892bc534a78a64bf190da00db91fd49df4c3838e5b8d0396cce15b SHA512 1485eace5526f53f6c41200e63d6d5d0ff217f22ec4788d58b33a33c64e344609f95bf2b73a8f35fd395914b33910b38a0348b35b488dadbdd43e24ac0bfed9f
-DIST ppsspp-1.5.4.tar.gz 19008538 BLAKE2B 10ca63a3f05757bd091a66b6563e34b3ca3c9c4df12a0b7796e42776d54997bec581582ee16706d5fb3630ebb8c0bcd1a5c0040856d94330865932b3d1ada2db SHA512 dbf4d2e9cc94a64908d5006ad562da72860fd12dadac66b0bdc6903d4cad4c81436963e24017517aa261440fd15efff6e5cab6ed7801928e107d7982d1604714
-EBUILD ppsspp-1.5.4-r2.ebuild 3251 BLAKE2B 2e38f51c429f679d8fbf437f2aed21cce48a4ee7f06906c8ee4b711327da1cf1448316b1c21869e55f6cdf75a46a1d08fa943206f2325e8fa83c2eeac482a6ce SHA512 ee7e8861f3c3f54f0147442c98139feaddfdf69d3074fbd5f1a57a6b12a3917b8d51fc5ff2ab419c5877c547830716c921a45aa3ebf7fd0a8710eec8dfd7824d
-EBUILD ppsspp-9999.ebuild 2197 BLAKE2B 6ab498d6e02727c4e9f13818b7fed55af2ebdf4f84038986194da1fb32c8d0ae43894d08bd4552455cf512de5f0e3a4a307bbccb37f2cd0d3db7ec7f26a403c1 SHA512 fa8e8db5ad6885d02ff30675e1cfb1c56762f3caa63b318b2dace273d78a340e49d8ca93d8758bc57ed94f5081b6eae63c558558ad22095a4d0f7082c442f1d3
-MISC metadata.xml 487 BLAKE2B 2b141f160af50cfa70e6c8cff123db36bea9c29ea4f96d3f25092d71fa0a1c061f6db7f5c4c012ced2165c6da9649b21aadcf417de0ae2e4a6c9217f03a6d700 SHA512 043e4876c162ea66401fdeefc9e40e4cd2b7f86c9262635a0039e5df37b1a992785cccfcd9eefe04b4375dfe9c406e5e0a79f7348fabc683ce8f40897e444358
+DIST ppsspp-1.10.3-assets_lang.tar.gz 623227 BLAKE2B 91bccaca863ffead629a00783d9afba8d8975a76085ce48bf7e8fa515f60c7e850b7aad023a365955576fc0093c1e2f33813a41225b1728e1cf9431034d199a3 SHA512 5f023b7a4ecade3d88aa36ecf724fcf98200de05fc25797f1895ec3fa952dc01256a181f88d2fe3c283151c83ef502c63939d13160e4d1252f2d47d00bd54223
+DIST ppsspp-1.10.3-ext_SPIRV-Cross.tar.gz 814213 BLAKE2B cfed78ac0ae4e6e7d82874b4fec2b5475063b09f8c8a3bef9bd23024978820dfbee68209a3ebbd3b883e8c2011d4353e1c0c1b543578d860cde8d20a0b304440 SHA512 b3faff10e2578a27740a013e463750c5244796e651b9586f900a3c97adba060f5e978d47a411f9fb255dd8314e21ea54cccbf90f726d1779448d5dc030f64b65
+DIST ppsspp-1.10.3-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
+DIST ppsspp-1.10.3-ext_discord-rpc.tar.gz 2107457 BLAKE2B 8a8117b13791aa4eda7addb974ca1bdd22766961af2de28eaa24337bdb0035b4538ca8241f07d8de9532ad8cd64ba846361bd9c4edb37ebeec149b7e72545d1f SHA512 17fb5de5d5afea9b7e0cdc116d5e3611b147eb2cde3a295a1a4ceb688bceb93d54feb2e479d511ce39d53a1380462a75dcdf6be9ddc2cece9d44b7f8ff7504af
+DIST ppsspp-1.10.3-ext_glslang.tar.gz 3138654 BLAKE2B fe5113842d18ce2327e59d2c40ac8847bc28cd8e53ea8d63f9585b6f97943587ba81521b8d0ac94bccde58e14487b1d524cebf61ded0944d9b55c2b7b63bf59b SHA512 153233429ac7ff16b8a530eae28152e55eb90481c9adca5119853fefe76b265b16b922694396d70e8e4511b2da5519c2e1e016bd79617befb90b609cad5a5fc3
+DIST ppsspp-1.10.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93
+DIST ppsspp-1.10.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
+DIST ppsspp-1.10.3-ffmpeg.tar.gz 387126903 BLAKE2B fd838039dda32f1b9d16649bd7e5a5d6fb3db74a8032d51973b01e567dd97c06c3d16b82a5176cb5828178f47619d767e1e0473a31484ab957636502a5172fa0 SHA512 74a8ee678c16578af63af3a6dd11dbd7bba265bc6581ff78c19269cff1b2896e236c6468175eb19c3c321ee67ebe1d62b4ff179163bb7162089c953a18483cf7
+DIST ppsspp-1.10.3.tar.gz 16956980 BLAKE2B 3f02abaf68a3a2acbaf71936fe70904a5065eb5c8afc8ec00804c325c597c4bf57fb4b9c7e1df7b302c085043a0ad210ca0d6ed2be89dd6ed28c9c635afff8db SHA512 522b2014810bd39a8554920b6d9bec7c47334d51537a7ca41482f629622b9e2d3dddfaaa5389b3c6c7dda8d7d3212b7ce9f6bd6e6d8498ffe370cf2cc58aac30
+EBUILD ppsspp-1.10.3.ebuild 3264 BLAKE2B 0a3cb8f78040261c11bf6cca3ea3c83b0c0d1fe7caf8c69ec085c9fc44ff4ac7298199b5336b59536f6ceb823c12a9da176f92a95f4cfdf47b7a2f11953812cc SHA512 c5b8f25b7150f8bfa63bf13d15edbf91824cd5fb837d2f980b785655634566248cc09b85960e23c35057c3bce4ec13ba907e0389e76c94dada7cad3361127031
+MISC metadata.xml 682 BLAKE2B 5d95a098006d02571fb86fef3fc287379d6c7174918de08c169d2239d87fad29ae68126667652b9cb08ed74ea06831573fdfcb37de2e4e65ed4bcdc14d148e28 SHA512 a626149a0a8d462a8124ed8e2d1122beb493624922efe3c44e8ba9a37b081a23b72971b29413b59d613ed417ac9d9a7dca1c300237e97250e079628b483280bd
diff --git a/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch b/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch
deleted file mode 100644
index 2a136a39e8de..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
-index 717177ef81ff..22239782210d 100644
---- a/UI/NativeApp.cpp
-+++ b/UI/NativeApp.cpp
-@@ -317,7 +317,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
- 
- 	// We want this to be FIRST.
- #ifdef USING_QT_UI
--	VFSRegister("", new AssetsAssetReader());
-+	VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/"));
- #elif defined(IOS)
- 	// Packed assets are included in app
- 	VFSRegister("", new DirectoryAssetReader(external_dir));
diff --git a/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch b/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch
deleted file mode 100644
index d738d4bc56c3..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 70c54a7d1ab15c0cf84a205b944db7e0339242e0 Mon Sep 17 00:00:00 2001
-From: Greg V <greg@unrelenting.technology>
-Date: Sat, 21 Apr 2018 16:44:45 +0300
-Subject: [PATCH] Fix build with ffmpeg 4.0
-
----
- Core/HLE/sceMpeg.cpp | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
-index 592320515e..ae309d7b2e 100644
---- a/Core/HLE/sceMpeg.cpp
-+++ b/Core/HLE/sceMpeg.cpp
-@@ -884,13 +884,16 @@ class H264Frames{
- 		}
- 	};
- #ifndef USE_FFMPEG
--#define FF_INPUT_BUFFER_PADDING_SIZE 16
-+#define AV_INPUT_BUFFER_PADDING_SIZE 16
-+#endif
-+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
-+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
- #endif
- 	void addpadding(){
--		u8* str = new u8[size + FF_INPUT_BUFFER_PADDING_SIZE];
-+		u8* str = new u8[size + AV_INPUT_BUFFER_PADDING_SIZE];
- 		memcpy(str, stream, size);
--		memset(str + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
--		size += FF_INPUT_BUFFER_PADDING_SIZE;
-+		memset(str + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-+		size += AV_INPUT_BUFFER_PADDING_SIZE;
- 		delete[] stream;
- 		stream = str;
- 	}
diff --git a/games-emulation/ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch b/games-emulation/ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch
deleted file mode 100644
index 0a7c45a810b2..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Common/Hashmaps.h
-+++ b/Common/Hashmaps.h
-@@ -2,6 +2,7 @@
- 
- #include <cstring>
- #include <vector>
-+#include <stdint.h> /* uint32_t */
- 
- #include "ext/xxhash.h"
- #include "Common/CommonFuncs.h"
diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml
index 5197ad9867ba..734835063341 100644
--- a/games-emulation/ppsspp/metadata.xml
+++ b/games-emulation/ppsspp/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="headless">Build headless version of the PPSSPP</flag>
-		<flag name="system-ffmpeg">Use the system-wide media-video/ffmpeg instead of bundled</flag>
-	</use>
-	<upstream>
-		<bugs-to>https://github.com/hrydgard/ppsspp/issues</bugs-to>
-		<remote-id type="github">hrydgard/ppsspp</remote-id>
-	</upstream>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <use>
+        <flag name="system-ffmpeg">Use the system-wide media-video/ffmpeg instead of bundled</flag>
+    </use>
+    <upstream>
+        <bugs-to>https://github.com/hrydgard/ppsspp/issues</bugs-to>
+        <remote-id type="github">hrydgard/ppsspp</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/games-emulation/ppsspp/ppsspp-1.10.3.ebuild b/games-emulation/ppsspp/ppsspp-1.10.3.ebuild
new file mode 100644
index 000000000000..41b2ef1ee03e
--- /dev/null
+++ b/games-emulation/ppsspp/ppsspp-1.10.3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+DESCRIPTION="A PSP emulator written in C++"
+HOMEPAGE="https://www.ppsspp.org/"
+SRC_URI="
+	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
+	https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ${P}-ext_armips.tar.gz
+	https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ${P}-ext_rapidjson.tar.gz
+	https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ${P}-ext_discord-rpc.tar.gz
+	https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz -> ${P}-ext_glslang.tar.gz
+	https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ${P}-ext_native_tools_prebuilt.tar.gz
+	https://github.com/hrydgard/ppsspp-lang/archive/fd6f5bc01afb419eacca538b425c01eb2a055393.tar.gz -> ${P}-assets_lang.tar.gz
+	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/d3e695286cce346274192c214c00f021c00cd575.tar.gz -> ${P}-ffmpeg.tar.gz )
+"
+
+RESTRICT="test"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qt5 sdl +system-ffmpeg"
+REQUIRED_USE="!qt5? ( sdl )"
+
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/libzip:=
+	dev-util/glslang:=
+	media-libs/glew:=
+	sys-libs/zlib:=
+	virtual/opengl
+	sdl? ( media-libs/libsdl2 )
+	system-ffmpeg? ( media-video/ffmpeg:= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtmultimedia:5[-gles2-only]
+		dev-qt/qtopengl:5[-gles2-only]
+		dev-qt/qtwidgets:5[-gles2-only]
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4-O2.patch"
+)
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+
+	cd "${S}" || die
+	local i list=(
+		assets_lang
+		ext_SPIRV-Cross
+		ext_armips
+		ext_discord-rpc
+		ext_glslang
+		ext_native_tools_prebuilt
+		ext_rapidjson
+	)
+	if ! use system-ffmpeg; then
+		list+=( ffmpeg )
+	fi
+	for i in "${list[@]}"; do
+		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
+	done
+}
+
+src_prepare() {
+	if ! use system-ffmpeg; then
+		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package sdl SDL2)
+		-DHEADLESS=true
+		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
+		-DUSE_SYSTEM_LIBZIP=ON
+		-DUSE_SYSTEM_SNAPPY=ON
+		-DUSING_QT_UI=$(usex qt5)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	insinto /usr/share/"${PN}"
+	doins -r "${BUILD_DIR}/assets"
+
+	local i
+	for i in 16 24 32 48 64 96 128 256 512 ; do
+		doicon -s "${i}" icons/hicolor/"${i}x${i}"/apps/"${PN}.png"
+	done
+
+	dobin "${BUILD_DIR}/PPSSPPHeadless"
+	dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
+	make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use system-ffmpeg; then
+		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
+		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
+	fi
+}
diff --git a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
deleted file mode 100644
index e83d7dac0129..000000000000
--- a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="A PSP emulator written in C++"
-HOMEPAGE="https://www.ppsspp.org/"
-SRC_URI="
-	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ${P}-ffmpeg.tar.gz )
-	https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz -> ${P}-assets_lang.tar.gz
-	https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz -> ${P}-pspautotests.tar.gz
-	https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ${P}-dx9sdk.tar.gz
-	https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz -> ${P}-ext_glslang.tar.gz
-	https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz -> ${P}-ext_armips.tar.gz
-	https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ${P}-ext_armips_ext_tinyformat.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headless +qt5 sdl +system-ffmpeg"
-REQUIRED_USE="!qt5? ( sdl )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/libzip:=
-	media-libs/glew:=
-	sys-libs/zlib:=
-	virtual/opengl
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-		!sdl? ( dev-qt/qtmultimedia:5 )
-	)
-	sdl? ( media-libs/libsdl2 )
-	system-ffmpeg? ( media-video/ffmpeg:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-assets-lookup.patch
-	"${FILESDIR}"/${PN}-1.4-O2.patch
-	"${FILESDIR}"/${P}-ffmpeg-4.patch
-	"${FILESDIR}"/${P}-stdint-gcc-10.patch
-)
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}" || die
-	local i list=( assets_lang pspautotests dx9sdk ext_glslang ext_armips ext_SPIRV-Cross ext_armips_ext_tinyformat )
-	if ! use system-ffmpeg; then
-		list+=( ffmpeg )
-	fi
-	for i in "${list[@]}"; do
-		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
-	done
-}
-
-src_prepare() {
-	if ! use system-ffmpeg; then
-		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHEADLESS=$(usex headless)
-		-DUSING_QT_UI=$(usex qt5)
-		$(cmake-utils_use_find_package sdl SDL2)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
-	insinto /usr/share/"${PN}"
-	doins -r "${BUILD_DIR}/assets"
-	dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
-	local i
-	for i in 16 24 32 48 64 96 128 256 512 ; do
-		doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
-	done
-	make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
-}
-
-pkg_postinst() {
-	if use system-ffmpeg; then
-		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
-		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
-	fi
-}
diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild
deleted file mode 100644
index 1f03ec0b1d0d..000000000000
--- a/games-emulation/ppsspp/ppsspp-9999.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop git-r3
-
-DESCRIPTION="A PSP emulator written in C++"
-HOMEPAGE="https://www.ppsspp.org/"
-EGIT_REPO_URI="https://github.com/hrydgard/${PN}.git"
-EGIT_SUBMODULES=( '*' )
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="headless +qt5 sdl +system-ffmpeg"
-REQUIRED_USE="!qt5? ( sdl )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/libzip:=
-	media-libs/glew:=
-	sys-libs/zlib:=
-	virtual/opengl
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-		!sdl? ( dev-qt/qtmultimedia:5 )
-	)
-	sdl? ( media-libs/libsdl2 )
-	system-ffmpeg? ( media-video/ffmpeg:= )
-"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	use system-ffmpeg && EGIT_SUBMODULES+=( '-ffmpeg' )
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	# https://github.com/hrydgard/ppsspp/blob/150619c5a341f372266bec86fd874ac5a1343a43/UI/NativeApp.cpp#L318
-	# patch ppsspp to use /usr/share instead of working dir to find the assets
-	sed -i 's|VFSRegister("", new AssetsAssetReader());|VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/"));|g' UI/NativeApp.cpp || die "Patching qt assets path failed"
-
-	sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
-	if ! use system-ffmpeg; then
-		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHEADLESS=$(usex headless)
-		-DUSING_QT_UI=$(usex qt5)
-		$(cmake-utils_use_find_package sdl SDL2)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
-	insinto /usr/share/"${PN}"
-	doins -r "${BUILD_DIR}/assets"
-	dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
-	local i
-	for i in 16 24 32 48 64 96 128 256 512 ; do
-		doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
-	done
-	make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
-}
-
-pkg_postinst() {
-	if use system-ffmpeg; then
-		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
-		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
-	fi
-}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index dff7e9a0d274..da6cb1dc4fb8 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/dMagnetic/Manifest b/games-engines/dMagnetic/Manifest
index d6f48f86f81e..c6a2180694fb 100644
--- a/games-engines/dMagnetic/Manifest
+++ b/games-engines/dMagnetic/Manifest
@@ -1,3 +1,3 @@
-DIST dMagnetic_0.27.tar.bz2 72832 BLAKE2B 4285043f85621422a8c5de637774812acf107f979a7c689bc36a8578e3bbe97d8ef88470d6075114f3e48c3ffce2551105fd7deafc25c7ac2300e07f66e6b65f SHA512 932e9b15eeb313a47ae2cca86316926cf4987a115dd31b7efa06669bb7bf056b6f289baa72ffc27fe1ff153f6ed96b06fd268b703479dfaaacd6a76e8a8dcd25
-EBUILD dMagnetic-0.27.ebuild 766 BLAKE2B a82da48542080663586445e2eed7b65dbca6df9198ac0b7ed1d19578a289e518577d8498ca9f8bae0a20f34765078e1f952dbb71e233907604012b47def67d5e SHA512 e96c8ecfa191962d1ec66522f7487bf29598d56c723192ca8c9e31f50b73795ca2f25854dfd18850adcfd3587a6158e9fe9ddf3934a490a392f5f9b813e42d96
+DIST dMagnetic_0.28.tar.bz2 77910 BLAKE2B bef916abd1ac6b56f680ac696f3ce52e4b451437acda3f7b4f4f8899d526f635993c1cab5441716d387b2a085c906be0806a4f5834197cfbe6a0d0b442f0adc7 SHA512 1ddbe576f5141646c2856d5b370841efa34a022d66c6c3bd9c6b1c2b374f336eef826a6f55254255c05f99d3cf1ab3c5291d9c3bf19590ef254824976b06dea6
+EBUILD dMagnetic-0.28.ebuild 766 BLAKE2B a82da48542080663586445e2eed7b65dbca6df9198ac0b7ed1d19578a289e518577d8498ca9f8bae0a20f34765078e1f952dbb71e233907604012b47def67d5e SHA512 e96c8ecfa191962d1ec66522f7487bf29598d56c723192ca8c9e31f50b73795ca2f25854dfd18850adcfd3587a6158e9fe9ddf3934a490a392f5f9b813e42d96
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-engines/dMagnetic/dMagnetic-0.27.ebuild b/games-engines/dMagnetic/dMagnetic-0.28.ebuild
similarity index 100%
rename from games-engines/dMagnetic/dMagnetic-0.27.ebuild
rename to games-engines/dMagnetic/dMagnetic-0.28.ebuild
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 1a59bc6b66ba..d971aec7481e 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 6e629f37133e..423a26f7c2bd 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,13 +1,3 @@
-AUX kdeconnect-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch 2893 BLAKE2B 2e0fcf55ccef118b95d3ec93dbdbe11a41922998b796b5114258c7f245aee5758fcd7cf6e8f5be58e0576f204c906ea9929e81ff5546cd5d9f95ffea83575275 SHA512 9625217ce5a654104170ced8cf87efe14d553f281b9bd3850b2a3071b04d4e6f3e09cc8f4841388fb557931c80475b6f1c11863af1da7b526556fe3ab3c6259d
-AUX kdeconnect-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch 1096 BLAKE2B 21a4b7b4ea36617fa3f2fb566446e56c4276c77b4cc07ccc0e097555ae23c560fd9709034ef9153d680ab2d58f848143657d1575d80db1a4803302d494a9850c SHA512 c1f901f11f33fdbdca968e52ec3a79b59eb8f4757ffba2b23883161fe41a45e8f6cddd821e1a910d80605b92a0b9953cde8fe60261f39f0fb28d2afd4d611210
-AUX kdeconnect-20.04.3-03-Fix-use-after-free-in-LanLinkProvider-connectError.patch 1121 BLAKE2B 902cbb2db6d5baf340e2f49531d75fb4ca6d368e1efcc4da5dfc8a17fb825b390af74ee4574b134d216db67cc0a0fcfcbbc02a63c58f74656020dc6f3068288c SHA512 282053314df245cf9fd00315b59448a7d7a1a1c73f8badeb98daafc7d56e17b6755128183a516e5d1c93deae83c7c756b1ca9e485f6a1c474a556d68c5a64942
-AUX kdeconnect-20.04.3-04-Limit-identity-packets-to-8KiB.patch 1537 BLAKE2B cc0642738e4a262572b63f417511cf5296488e83b5b82189a6d268a360603d51970ac8cfade5c28cf00294c5675bb8f1b375aaba51b12024790723b0d6ecd771 SHA512 6db188aeb96ce93d92ad0f11fe8809a0fb32363a84612824efe21228547c45f6b38e3dae834ba8f55a14e4cba1df004915dcf26108cca211ee5a008f17562e41
-AUX kdeconnect-20.04.3-05-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch 1372 BLAKE2B d806766634088fbc26963223132c8c2b12cb690520e69c98470b87b5d9f94c896d243e19561fdbff1a92164cc071570cc5ff7ad0127693e6738b854a99b03f49 SHA512 c19cd4aff831b5918d6bbc5e23d5cbd845dfd9bfbd6515e3f7c9ba65e590bae1a643d9e784b1a9bbeed74b04b0d4aead7415a4bf7c1842918bce08560c06687c
-AUX kdeconnect-20.04.3-06-Don-t-brute-force-reading-the-socket.patch 3199 BLAKE2B 0bc6f9a430e90801a4930975a460cbdc7ead387c6ba24ab62147c47e7ba49986effed1a5da9f8125fed5e33403eafe12c1068127d3ec340a14ae4e45778f873a SHA512 8cf8ffe0df864a82976c51e95c9806109e3c66d792ce31016515ac1132674cf97be71d70ea9efb29892ec1624fab6fcac553e1e64c7950a3b0bbdb7d8e79bbea
-AUX kdeconnect-20.04.3-07-Limit-number-of-connected-sockets-from-unpaired-devi.patch 1836 BLAKE2B 9886ba5833626546308d6f1b4fa4bbc7455628d1737a7126f8be40d652275249b2949028e93177ab994bfed102ff835c7f8882b2e9d85f186efd3232efeae90f SHA512 6feb3f96f8f6bb70d383ae66134b2773ea7b4b5275ce16b92974365b4d3bf29d5fe7db6fdd6c60d777a2cf3feac5dc7e989e562e5cd62a6d50c98d2b030f1c32
-AUX kdeconnect-20.04.3-08-Do-not-remember-more-than-a-few-identity-packets-at-.patch 2107 BLAKE2B 902059f4b1d40f3d221e024ec0fb86e8664f918ed3cb1236b9b3d98173ed3a7387301965ee0f2925ea304d77a268f2b2c29c89463b1b5e2aed52f7871a324c3a SHA512 54d0686e6af67a3c075bcb844b4f80941a9eb69f180c996f17c3ab57437b03a91b33b3d91966a06159ced16fc4b7a07711e100d698f73a0f855c3195af83471c
-AUX kdeconnect-20.04.3-09-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch 1197 BLAKE2B 4cf50f0d883b194c92f16961df4d7158e19644c8f6756afa27bbfe8438da0ae44fe96d29184060c242ffc0870536d35b9871f4dbde042a2fe176abb8cf0a2180 SHA512 ff3b227bd15612201a0510a5ea0f330372e712b05b170b34d671b68e7ac3d1f561a65fcc1ea55d239bc64065186b70a17530061ddfadf6ce4f0a13a9a8d100e9
-AUX kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch 2261 BLAKE2B 531b3a81f9ed7c50794191140bd510f0ee5968c4deb67056f0f37649f19caa96fc0a2cfd9bd29086b6c9c59cd591d41a2db52627c5006deef41dd74f86b36ed6 SHA512 20e856aba62f5528b6772d8693c435ef7070065377d5dbee9e695a11f6d782082fdcc8b5d40804137a93db4f12f16a41a2b8af4212179cd1a0f43e1f30e71453
 DIST kdeconnect-kde-20.08.3.tar.xz 420232 BLAKE2B 2044c121ea769f915fd7026201ec038961720df379096d4a93917b76ac0baccf0a3e8e864bd9da8536b4efc930ba05d1c1d209352c68ed3917fbe8a1747086e6 SHA512 89b5af789b6db58a7f2ae3436f0a212d72b7ba2511fc62cb8cd90d4291939e70bd3922256f17a6a01d2e6952f0c03912c2793728c8c18fedba608ef02bd9c9c3
 EBUILD kdeconnect-20.08.3.ebuild 2262 BLAKE2B 03b72bc5aaca68e4670793927c11ce195549f702e045c7aeab088dd9462ee6099b80ac30f15bfa9ed1246a756ef90c7c532ffff22cad673a20455e6dc9f5470e SHA512 b025519dcb7beb30bce5f398f42d08aa849d26cd065c50c1e6625f8c53edf09c5575f8349cbba2d079d0db95058e6f53151a2777f3add09a1d4be9de0a3d6c1d
 MISC metadata.xml 577 BLAKE2B 4a7b31db0d4e48ab09de42119a36b7733603d2b3f85f7cbf36b61713f2f87488f4fe1223d2dc2ef7460b41525eb59fe5e43196df54f8f454241e56518ad73855 SHA512 faf6e262a0f0d020bbaf4372c8f5c308de1fae0cee4f37cdf9509b585ead0706ba06109f27e691cbd0ebceadb7c352b0d335dc29e87baee13ac3dda5eca11a5c
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch
deleted file mode 100644
index cafeb9501cd8..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f183b5447bad47655c21af87214579f03bf3a163 Mon Sep 17 00:00:00 2001
-From: Albert Vaca Cintora <albertvaka@gmail.com>
-Date: Thu, 24 Sep 2020 16:59:22 +0200
-Subject: [PATCH 01/10] Do not ignore SSL errors, except for self-signed cert
- errors.
-
-Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
----
- core/backends/lan/lanlinkprovider.cpp | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
-index d9a7d8fa..fc005cee 100644
---- a/core/backends/lan/lanlinkprovider.cpp
-+++ b/core/backends/lan/lanlinkprovider.cpp
-@@ -297,9 +297,7 @@ void LanLinkProvider::tcpSocketConnected()
- 
-             connect(socket, &QSslSocket::encrypted, this, &LanLinkProvider::encrypted);
- 
--            if (isDeviceTrusted) {
--                connect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &LanLinkProvider::sslErrors);
--            }
-+            connect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &LanLinkProvider::sslErrors);
- 
-             socket->startServerEncryption();
- 
-@@ -326,8 +324,6 @@ void LanLinkProvider::encrypted()
- 
-     QSslSocket* socket = qobject_cast<QSslSocket*>(sender());
-     if (!socket) return;
--    // TODO delete me?
--    disconnect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &LanLinkProvider::sslErrors);
- 
-     Q_ASSERT(socket->mode() != QSslSocket::UnencryptedMode);
-     LanDeviceLink::ConnectionStarted connectionOrigin = (socket->mode() == QSslSocket::SslClientMode)? LanDeviceLink::Locally : LanDeviceLink::Remotely;
-@@ -346,14 +342,20 @@ void LanLinkProvider::sslErrors(const QList<QSslError>& errors)
-     QSslSocket* socket = qobject_cast<QSslSocket*>(sender());
-     if (!socket) return;
- 
--    qCDebug(KDECONNECT_CORE) << "Failing due to " << errors;
--    Device* device = Daemon::instance()->getDevice(socket->peerVerifyName());
--    if (device) {
--        device->unpair();
-+    bool fatal = false;
-+    for (const QSslError& error : errors) {
-+        if (error.error() != QSslError::SelfSignedCertificate) {
-+            qCCritical(KDECONNECT_CORE) << "Disconnecting due to fatal SSL Error: " << error;
-+            fatal = true;
-+        } else {
-+            qCDebug(KDECONNECT_CORE) << "Ignoring self-signed cert error";
-+        }
-     }
- 
--    delete m_receivedIdentityPackets.take(socket).np;
--    // Socket disconnects itself on ssl error and will be deleted by deleteLater slot, no need to delete manually
-+    if (fatal) {
-+        socket->disconnectFromHost();
-+        delete m_receivedIdentityPackets.take(socket).np;
-+    }
- }
- 
- //I'm the new device and this is the answer to my UDP identity packet (no data received yet). They are connecting to us through TCP, and they should send an identity.
--- 
-2.28.0
-
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch
deleted file mode 100644
index b374d001036c..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b279c52101d3f7cc30a26086d58de0b5f1c547fa Mon Sep 17 00:00:00 2001
-From: Albert Vaca Cintora <albertvaka@gmail.com>
-Date: Thu, 24 Sep 2020 17:01:03 +0200
-Subject: [PATCH 02/10] Do not leak the local user in the device name.
-
-Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
----
- core/kdeconnectconfig.cpp | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/core/kdeconnectconfig.cpp b/core/kdeconnectconfig.cpp
-index 91719303..a8dbcf5c 100644
---- a/core/kdeconnectconfig.cpp
-+++ b/core/kdeconnectconfig.cpp
-@@ -90,13 +90,7 @@ KdeConnectConfig::KdeConnectConfig()
- 
- QString KdeConnectConfig::name()
- {
--    QString username;
--    #ifdef Q_OS_WIN
--        username = QString::fromLatin1(qgetenv("USERNAME"));
--    #else
--        username = QString::fromLatin1(qgetenv("USER"));
--    #endif
--    QString defaultName = username + QStringLiteral("@") + QHostInfo::localHostName();
-+    QString defaultName = QHostInfo::localHostName();
-     QString name = d->m_config->value(QStringLiteral("name"), defaultName).toString();
-     return name;
- }
--- 
-2.28.0
-
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-03-Fix-use-after-free-in-LanLinkProvider-connectError.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-03-Fix-use-after-free-in-LanLinkProvider-connectError.patch
deleted file mode 100644
index 52fb9057b930..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-03-Fix-use-after-free-in-LanLinkProvider-connectError.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d35b88c1b25fe13715f9170f18674d476ca9acdc Mon Sep 17 00:00:00 2001
-From: Matthias Gerstner <mgerstner@suse.de>
-Date: Thu, 24 Sep 2020 17:03:06 +0200
-Subject: [PATCH 03/10] Fix use after free in LanLinkProvider::connectError()
-
-If QSslSocket::connectToHost() hasn't finished running.
-
-Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
----
- core/backends/lan/lanlinkprovider.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
-index fc005cee..235c221f 100644
---- a/core/backends/lan/lanlinkprovider.cpp
-+++ b/core/backends/lan/lanlinkprovider.cpp
-@@ -252,7 +252,7 @@ void LanLinkProvider::connectError(QAbstractSocket::SocketError socketError)
-     //The socket we created didn't work, and we didn't manage
-     //to create a LanDeviceLink from it, deleting everything.
-     delete m_receivedIdentityPackets.take(socket).np;
--    delete socket;
-+    socket->deleteLater();
- }
- 
- //We received a UDP packet and answered by connecting to them by TCP. This gets called on a successful connection.
--- 
-2.28.0
-
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-04-Limit-identity-packets-to-8KiB.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-04-Limit-identity-packets-to-8KiB.patch
deleted file mode 100644
index e083f5896def..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-04-Limit-identity-packets-to-8KiB.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b496e66899e5bc9547b6537a7f44ab44dd0aaf38 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Wed, 16 Sep 2020 02:28:58 +0200
-Subject: [PATCH 04/10] Limit identity packets to 8KiB
-
-Healthy identity packages shouldn't be that big and we don't want to
-allow systems around us to send us ever humongous packages that will
-just leave us without any memory.
-
-Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
----
- core/backends/lan/lanlinkprovider.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
-index 235c221f..1fd3870e 100644
---- a/core/backends/lan/lanlinkprovider.cpp
-+++ b/core/backends/lan/lanlinkprovider.cpp
-@@ -381,6 +381,14 @@ void LanLinkProvider::newConnection()
- void LanLinkProvider::dataReceived()
- {
-     QSslSocket* socket = qobject_cast<QSslSocket*>(sender());
-+    //the size here is arbitrary and is now at 8192 bytes. It needs to be considerably long as it includes the capabilities but there needs to be a limit
-+    //Tested between my systems and I get around 2000 per identity package.
-+    if (socket->bytesAvailable() > 8192) {
-+        qCWarning(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Suspiciously long identity package received. Closing connection." << socket->peerAddress() << socket->bytesAvailable();
-+        socket->disconnectFromHost();
-+        return;
-+    }
-+
- #if QT_VERSION < QT_VERSION_CHECK(5,7,0)
-     if (!socket->canReadLine())
-         return;
--- 
-2.28.0
-
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-05-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-05-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch
deleted file mode 100644
index 1465ce48b989..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-05-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5310eae85dbdf92fba30375238a2481f2e34943e Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Wed, 16 Sep 2020 02:44:38 +0200
-Subject: [PATCH 05/10] Do not let lanlink connections stay open for long
- without authenticating
-
-If there's no information received, close the socket to try again.
-
-Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
----
- core/backends/lan/lanlinkprovider.cpp | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
-index 1fd3870e..a4942c65 100644
---- a/core/backends/lan/lanlinkprovider.cpp
-+++ b/core/backends/lan/lanlinkprovider.cpp
-@@ -374,6 +374,16 @@ void LanLinkProvider::newConnection()
-         connect(socket, &QIODevice::readyRead,
-                 this, &LanLinkProvider::dataReceived);
- 
-+        QTimer* timer = new QTimer(socket);
-+        timer->setSingleShot(true);
-+        timer->setInterval(1000);
-+        connect(socket, &QSslSocket::encrypted,
-+                timer, &QObject::deleteLater);
-+        connect(timer, &QTimer::timeout, socket, [socket] {
-+            qCWarning(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Host timed out without sending any identity." << socket->peerAddress();
-+            socket->disconnectFromHost();
-+        });
-+        timer->start();
-     }
- }
- 
--- 
-2.28.0
-
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-06-Don-t-brute-force-reading-the-socket.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-06-Don-t-brute-force-reading-the-socket.patch
deleted file mode 100644
index 7bb674a8e8f2..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-06-Don-t-brute-force-reading-the-socket.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 721ba9faafb79aac73973410ee1dd3624ded97a5 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Wed, 16 Sep 2020 02:27:13 +0200
-Subject: [PATCH 06/10] Don't brute-force reading the socket
-
-The package will arrive eventually, and dataReceived will be emitted.
-Otherwise we just end up calling dataReceived to no end.
-
-Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
----
- core/backends/lan/socketlinereader.cpp |  8 -------
- tests/testsocketlinereader.cpp         | 31 ++++++++++++++++++++++++--
- 2 files changed, 29 insertions(+), 10 deletions(-)
-
-diff --git a/core/backends/lan/socketlinereader.cpp b/core/backends/lan/socketlinereader.cpp
-index f67fdf3f..da77052a 100644
---- a/core/backends/lan/socketlinereader.cpp
-+++ b/core/backends/lan/socketlinereader.cpp
-@@ -38,14 +38,6 @@ void SocketLineReader::dataReceived()
-         }
-     }
- 
--    //If we still have things to read from the socket, call dataReceived again
--    //We do this manually because we do not trust readyRead to be emitted again
--    //So we call this method again just in case.
--    if (m_socket->bytesAvailable() > 0) {
--        QMetaObject::invokeMethod(this, "dataReceived", Qt::QueuedConnection);
--        return;
--    }
--
-     //If we have any packets, tell it to the world.
-     if (!m_packets.isEmpty()) {
-         Q_EMIT readyRead();
-diff --git a/tests/testsocketlinereader.cpp b/tests/testsocketlinereader.cpp
-index 75584556..b6425b03 100644
---- a/tests/testsocketlinereader.cpp
-+++ b/tests/testsocketlinereader.cpp
-@@ -25,16 +25,19 @@
- #include <QProcess>
- #include <QEventLoop>
- #include <QTimer>
-+#include <QSignalSpy>
- 
- class TestSocketLineReader : public QObject
- {
-     Q_OBJECT
- public Q_SLOTS:
--    void initTestCase();
-+    void init();
-+    void cleanup() { delete m_server; }
-     void newPacket();
- 
- private Q_SLOTS:
-     void socketLineReader();
-+    void badData();
- 
- private:
-     QTimer m_timer;
-@@ -45,8 +48,9 @@ private:
-     SocketLineReader* m_reader;
- };
- 
--void TestSocketLineReader::initTestCase()
-+void TestSocketLineReader::init()
- {
-+    m_packets.clear();
-     m_server = new Server(this);
- 
-     QVERIFY2(m_server->listen(QHostAddress::LocalHost, 8694), "Failed to create local tcp server");
-@@ -97,6 +101,29 @@ void TestSocketLineReader::socketLineReader()
-     }
- }
- 
-+void TestSocketLineReader::badData()
-+{
-+    const QList<QByteArray> dataToSend = { "data1\n", "data" }; //does not end in a \n
-+    for (const QByteArray& line : qAsConst(dataToSend)) {
-+        m_conn->write(line);
-+    }
-+    m_conn->flush();
-+
-+    QSignalSpy spy(m_server, &QTcpServer::newConnection);
-+    QVERIFY(m_server->hasPendingConnections() || spy.wait(1000));
-+    QSslSocket* sock = m_server->nextPendingConnection();
-+
-+    QVERIFY2(sock != nullptr, "Could not open a connection to the client");
-+
-+    m_reader = new SocketLineReader(sock, this);
-+    connect(m_reader, &SocketLineReader::readyRead, this, &TestSocketLineReader::newPacket);
-+    m_timer.start();
-+    m_loop.exec();
-+
-+    QCOMPARE(m_packets.count(), 1);
-+    QCOMPARE(m_packets[0], dataToSend[0]);
-+}
-+
- void TestSocketLineReader::newPacket()
- {
-     if (!m_reader->bytesAvailable()) {
--- 
-2.28.0
-
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-07-Limit-number-of-connected-sockets-from-unpaired-devi.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-07-Limit-number-of-connected-sockets-from-unpaired-devi.patch
deleted file mode 100644
index 6a6bdb01cb96..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-07-Limit-number-of-connected-sockets-from-unpaired-devi.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ae58b9dec49c809b85b5404cee17946116f8a706 Mon Sep 17 00:00:00 2001
-From: Albert Vaca Cintora <albertvaka@gmail.com>
-Date: Thu, 24 Sep 2020 17:13:34 +0200
-Subject: [PATCH 07/10] Limit number of connected sockets from unpaired devices
-
-Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
----
- core/backends/lan/lanlinkprovider.cpp | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
-index a4942c65..770e7866 100644
---- a/core/backends/lan/lanlinkprovider.cpp
-+++ b/core/backends/lan/lanlinkprovider.cpp
-@@ -46,6 +46,8 @@
- 
- #define MIN_VERSION_WITH_SSL_SUPPORT 6
- 
-+static const int MAX_UNPAIRED_CONNECTIONS = 42;
-+
- LanLinkProvider::LanLinkProvider(
-         bool testMode,
-         quint16 udpBroadcastPort,
-@@ -555,6 +557,15 @@ void LanLinkProvider::addLink(const QString& deviceId, QSslSocket* socket, Netwo
-         deviceLink->reset(socket, connectionOrigin);
-     } else {
-         deviceLink = new LanDeviceLink(deviceId, this, socket, connectionOrigin);
-+        // Socket disconnection will now be handled by LanDeviceLink
-+        disconnect(socket, &QAbstractSocket::disconnected, socket, &QObject::deleteLater);
-+        bool isDeviceTrusted = KdeConnectConfig::instance().trustedDevices().contains(deviceId);
-+        if (!isDeviceTrusted && m_links.size() > MAX_UNPAIRED_CONNECTIONS) {
-+            qCWarning(KDECONNECT_CORE) << "Too many unpaired devices to remember them all. Ignoring " << deviceId;
-+            socket->disconnectFromHost();
-+            socket->deleteLater();
-+            return;
-+        }
-         connect(deviceLink, &QObject::destroyed, this, &LanLinkProvider::deviceLinkDestroyed);
-         m_links[deviceId] = deviceLink;
-         if (m_pairingHandlers.contains(deviceId)) {
--- 
-2.28.0
-
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-08-Do-not-remember-more-than-a-few-identity-packets-at-.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-08-Do-not-remember-more-than-a-few-identity-packets-at-.patch
deleted file mode 100644
index 36d612e9cbc1..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-08-Do-not-remember-more-than-a-few-identity-packets-at-.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 66c768aa9e7fba30b119c8b801efd49ed1270b0a Mon Sep 17 00:00:00 2001
-From: Albert Vaca Cintora <albertvaka@gmail.com>
-Date: Thu, 24 Sep 2020 17:16:02 +0200
-Subject: [PATCH 08/10] Do not remember more than a few identity packets at a
- time
-
-To prevent the kdeconnect process from using too much memory.
-
-Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
----
- core/backends/lan/lanlinkprovider.cpp | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
-index 770e7866..6afb8552 100644
---- a/core/backends/lan/lanlinkprovider.cpp
-+++ b/core/backends/lan/lanlinkprovider.cpp
-@@ -47,6 +47,7 @@
- #define MIN_VERSION_WITH_SSL_SUPPORT 6
- 
- static const int MAX_UNPAIRED_CONNECTIONS = 42;
-+static const int MAX_REMEMBERED_IDENTITY_PACKETS = 42;
- 
- LanLinkProvider::LanLinkProvider(
-         bool testMode,
-@@ -225,6 +226,12 @@ void LanLinkProvider::udpBroadcastReceived()
- 
-         //qCDebug(KDECONNECT_CORE) << "Received Udp identity packet from" << sender << " asking for a tcp connection on port " << tcpPort;
- 
-+        if (m_receivedIdentityPackets.size() > MAX_REMEMBERED_IDENTITY_PACKETS) {
-+            qCWarning(KDECONNECT_CORE) << "Too many remembered identities, ignoring" << receivedPacket->get<QString>(QStringLiteral("deviceId")) << "received via UDP";
-+            delete receivedPacket;
-+            continue;
-+        }
-+
-         QSslSocket* socket = new QSslSocket(this);
-         socket->setProxy(QNetworkProxy::NoProxy);
-         m_receivedIdentityPackets[socket].np = receivedPacket;
-@@ -435,6 +442,12 @@ void LanLinkProvider::dataReceived()
-         return;
-     }
- 
-+    if (m_receivedIdentityPackets.size() > MAX_REMEMBERED_IDENTITY_PACKETS) {
-+        qCWarning(KDECONNECT_CORE) << "Too many remembered identities, ignoring" << np->get<QString>(QStringLiteral("deviceId")) << "received via TCP";
-+        delete np;
-+        return;
-+    }
-+
-     // Needed in "encrypted" if ssl is used, similar to "tcpSocketConnected"
-     m_receivedIdentityPackets[socket].np = np;
- 
--- 
-2.28.0
-
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-09-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-09-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch
deleted file mode 100644
index c108144632ca..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-09-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 85b691e40f525e22ca5cc4ebe79c361d71d7dc05 Mon Sep 17 00:00:00 2001
-From: Albert Vaca Cintora <albertvaka@gmail.com>
-Date: Thu, 24 Sep 2020 17:18:06 +0200
-Subject: [PATCH 09/10] Limit the ports we try to connect to to the port range
- of KDE Connect
-
-So we can't trigger connections to other services.
-
-Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
----
- core/backends/lan/lanlinkprovider.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
-index 6afb8552..f3d6801d 100644
---- a/core/backends/lan/lanlinkprovider.cpp
-+++ b/core/backends/lan/lanlinkprovider.cpp
-@@ -223,6 +223,11 @@ void LanLinkProvider::udpBroadcastReceived()
-         }
- 
-         int tcpPort = receivedPacket->get<int>(QStringLiteral("tcpPort"));
-+        if (tcpPort < MIN_TCP_PORT || tcpPort > MAX_TCP_PORT) {
-+            qCDebug(KDECONNECT_CORE) << "TCP port outside of kdeconnect's range";
-+            delete receivedPacket;
-+            continue;
-+        }
- 
-         //qCDebug(KDECONNECT_CORE) << "Received Udp identity packet from" << sender << " asking for a tcp connection on port " << tcpPort;
- 
--- 
-2.28.0
-
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch
deleted file mode 100644
index d10f0193dacc..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 48180b46552d40729a36b7431e97bbe2b5379306 Mon Sep 17 00:00:00 2001
-From: Albert Vaca Cintora <albertvaka@gmail.com>
-Date: Thu, 24 Sep 2020 18:46:57 +0200
-Subject: [PATCH 10/10] Do not replace connections for a given deviceId if the
- certs have changed
-
-Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
----
- core/backends/lan/landevicelink.cpp   | 5 +++++
- core/backends/lan/landevicelink.h     | 1 +
- core/backends/lan/lanlinkprovider.cpp | 6 ++++++
- 3 files changed, 12 insertions(+)
-
-diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
-index 8a65fb92..41af6f0e 100644
---- a/core/backends/lan/landevicelink.cpp
-+++ b/core/backends/lan/landevicelink.cpp
-@@ -192,3 +192,8 @@ bool LanDeviceLink::linkShouldBeKeptAlive() {
-     //return (mConnectionSource == ConnectionStarted::Remotely || pairStatus() == Paired);
- 
- }
-+
-+QSslCertificate LanDeviceLink::certificate() const
-+{
-+    return m_socketLineReader->peerCertificate();
-+}
-diff --git a/core/backends/lan/landevicelink.h b/core/backends/lan/landevicelink.h
-index 28f63db2..485c58b5 100644
---- a/core/backends/lan/landevicelink.h
-+++ b/core/backends/lan/landevicelink.h
-@@ -56,6 +56,7 @@ public:
-     bool linkShouldBeKeptAlive() override;
- 
-     QHostAddress hostAddress() const;
-+    QSslCertificate certificate() const;
- 
- private Q_SLOTS:
-     void dataReceived();
-diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
-index f3d6801d..372cdc8f 100644
---- a/core/backends/lan/lanlinkprovider.cpp
-+++ b/core/backends/lan/lanlinkprovider.cpp
-@@ -345,6 +345,12 @@ void LanLinkProvider::encrypted()
-     NetworkPacket* receivedPacket = m_receivedIdentityPackets[socket].np;
-     const QString& deviceId = receivedPacket->get<QString>(QStringLiteral("deviceId"));
- 
-+    if (m_links.contains(deviceId) && m_links[deviceId]->certificate() != socket->peerCertificate()) {
-+        socket->disconnectFromHost();
-+        qCWarning(KDECONNECT_CORE) << "Got connection for the same deviceId but certificates don't match. Ignoring " << deviceId;
-+        return;
-+    }
-+
-     addLink(deviceId, socket, receivedPacket, connectionOrigin);
- 
-     // Copied from tcpSocketConnected slot, now delete received packet
--- 
-2.28.0
-
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 87d8a0e76fec..38451c5189ae 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 5635ddc0cd88..6caae6e9e090 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,4 +1,6 @@
 AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445
 DIST roundcubemail-1.4.8-complete.tar.gz 7032822 BLAKE2B 61c5329d9abe65baba3274d3cb9a6a435f886a0196c2881153da473eb415ad4c63dfdab49c67c75a2fd92ff55f9e6da7bdfcece7041ce408b2be628da47045d4 SHA512 8b7734cdec95954b7e18a0e44957da6ef74b5b0c3d28a1449e8634faa230844f5e0c28954245641758f8b2d9102aa32f279765ed3dfa20fa7b00dee4e5347362
+DIST roundcubemail-1.4.9-complete.tar.gz 7043437 BLAKE2B a1b7c6e160d29f61e2ca9c25f725b55411cb52c0f0d00fc4b3dc2ab1eb0edf190176ec932a297d6052b34047673e5dfb8cb13ad3a7b8b755e9d8e9265fb85aa9 SHA512 c6395757544b85693e808234f3dc6baac618ba115fb2c9eefc309ee18e74b2fdfbc0af00ac2b3b980fdd2abc56eefde47b535cdf688cfd2a5ce975786aca6572
 EBUILD roundcube-1.4.8.ebuild 1792 BLAKE2B 6ee68871faba7e25719ea805518faf117e5619cc265235e7df8189d557af0fbc48b4c1ee14f1241854e64bae810f05679d6a154a209795c2738fcd8e5f7b3626 SHA512 60ecc662e19e21ba510947dcb07db3dd62912f675ca9b5c1a4502df456d6be8109c7803b8e4322b307ca9daa28cc70ab39f037b7f290e14e96fa1c2539cb1862
+EBUILD roundcube-1.4.9.ebuild 1798 BLAKE2B e51db73005c7b8a1c2a501566efe426b7cbf4e8079149546ede7e520e528ef6c4743eb6c75ee674ea65ee69ebd25ebfdde023c1e248fd9e7c21f3b9a8a345db2 SHA512 f6ae8f889cd6a17f0367ebe6f4bac62eac7a43bb410d141a2fa7f68307315bb2b2f61319a0b1519af620a8d3aa17deb2a9fc3580c86c6a701ab5c6aeb304b54b
 MISC metadata.xml 888 BLAKE2B 08166287c0fc134f79884a6bd5cf96d67ab12a74422393d0ef8b4c89b588911e03d587f99bc62bff132494d021fc03b79fbe25a3a7e19ac9ae3107495f2d45c5 SHA512 c5522fd989d08c1de91aac7783e7fb8cbdf94669ca645357b58b3565ed604a52bf563d6417f28b6e2833ad51ee65ec4dfb76412ba88e1b280e346ad8d35b4f86
diff --git a/mail-client/roundcube/roundcube-1.4.9.ebuild b/mail-client/roundcube/roundcube-1.4.9.ebuild
new file mode 100644
index 000000000000..6d3b3ede4e45
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.4.9.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
+
+# 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"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="change-password enigma ldap mysql postgres sqlite ssl spell"
+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.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] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	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 ea044710c911..81bd9f060d44 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 14fe7e6fd7e8..87f24ddfaaec 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -3,7 +3,7 @@ AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f7
 DIST msmtp-1.8.12.tar.xz 364712 BLAKE2B 94707d18d9be71e8e51413cdcc55887fc15bd7d0f059d54cfcf4e07b5589febbb9ed4025206e3b82d1b12edad45086d3ad8a47fb3d37488a49e46984d7b7bc32 SHA512 8620e5e9a88a49769cfdbf2aa83842b230b3fd1584641d17129cb404e3c9696edd5a28237ef46a115ca82d2a846c0f653eaa837ba6f8512f8b57493d64451df8
 DIST msmtp-1.8.13.tar.xz 359536 BLAKE2B 824d88b571ac1dfd78046f1939fa83c4fad9679bce993c20d073df5cd431deee1ca36119123d307d788be13d700901c13c54ba47496f2148cb9fbf9e2308698c SHA512 1b466fc518d0468a8febdf238a6d422fabb95be8158d2e52e38aeb5e5b21661af9791ff8ed82f72f111cebe2ce1b93deabeb91dca4f06f09cf765152095a1cfd
 DIST msmtp-1.8.7.tar.xz 340908 BLAKE2B 5241acf54d5a6af6ccf2c3bfd33954a5235af2d2cb467e4134401538e60e1847489a7a599359e2d13202ea9637c32a67ec5180372b139e06f6d47f060cba6c8f SHA512 5a079cb90b48853ad812125e8b341f5bcd5f5ba4725d62c37210050896527b63f993aa6393f1d4107636153bf0ed84b0288e88a7e78a119c66b2d58f1e69a67d
-EBUILD msmtp-1.8.12.ebuild 3312 BLAKE2B 75ac051f396feadb86eb8536453236b08e0ba869808ba5805ec522f47103cf445e1770c47c806bac88d2c2e66d18e66e52d2d71f2bd08ecb041dcc248a7e9b76 SHA512 766f4df9e518a9a06190f0df248356b0fdc8707b23e381fafd8e4490b928502d0806635611445b8680b3269bc2a3af5ed3c3f09e9c715763e82bd50b37f22ff5
+EBUILD msmtp-1.8.12.ebuild 3308 BLAKE2B 79b949a500e88027d57cdc3c5bbcca4bbf8c5181b2cc002d120ca6fb51d8c2a801f387007377088d0711c46a1edc2b4cbdc9f5ddb0fae832ac46c655f18ca0f8 SHA512 21873bc55103a7aabf5adaffa45a52a91a36e7d67cf81b6fe82de2eba4e52bb32b608d648ed0d9b56b5fca20eb4a21d64f9e009fe5bb682a7619aba5a5f39171
 EBUILD msmtp-1.8.13.ebuild 3313 BLAKE2B 7ef4647ff8f55e4eb8f5a223c7086a47bc64536422c36e4129555d77ce36b5e0750cfb2579353a7475bf4a3e6fd69cfdef3233de32282af6ca5f171ad606eac1 SHA512 4535f9905169e72b6d66531217a71183d8779606b88e6b191880086a1ce69e43d23ea1e635bf7cbf7b5baa8d02fc64c107b8435b8c4f2182558bfe9693fdd3c5
 EBUILD msmtp-1.8.7-r1.ebuild 3318 BLAKE2B 4457fc5562fe18b025597a8d965204d6fec8c97b027857496cf441e0ef465e8d1217a8b2c0eb20fe319e7da9cedca51183a73b90dc4528a7fba090b41d46b0ec SHA512 f722e6f382f8620603183bfc12e7d4b9f855d1054a09686c5f42a0bba7d35a5dc28a03de93ea26e89ae65907ec8981dc07f839e41be33584875c5ba424b11ce9
 MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
diff --git a/mail-mta/msmtp/msmtp-1.8.12.ebuild b/mail-mta/msmtp/msmtp-1.8.12.ebuild
index c84a78f5ecd0..df489e993372 100644
--- a/mail-mta/msmtp/msmtp-1.8.12.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.12.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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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-libs/Manifest.gz b/media-libs/Manifest.gz
index 748cf4dc1212..3ea959697a3c 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 9105f2ea88f7..b1faeaf7e4b3 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -9,5 +9,5 @@ DIST libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd8
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2997 BLAKE2B 07eb75644ba9322de5b9c926c25f7f14b88cec9c331be79dc94c93f4b85492335ac5b4bcad08cc1400e63c58345b7e18c47d3efd25c4b4df631f2900fc23ccbb SHA512 27a1dc6d9c3f23af59d16e63a78b45320aac8be1feca9dbff4714b183ff2bf5b615856cba2f06f9aa45bae65e069708564763710afea2c1a5f4e2f13488da077
 EBUILD libjpeg-turbo-2.0.5-r2.ebuild 3004 BLAKE2B f5ee859c4da49f85b3519625d1b9e0756c052a8e6a2616560a6ca6d4061915c91489d8c23ae7a1017e377355b5a55be386b673b793dd3c01284d3825d355b258 SHA512 6ae05da3888ede7bb888dcc6c2a7d78701e14df4942f1f63384e391b6a1108e2fea8593ead06cd676de4150beb43eda0540383e00d4086c3f8f8cf836dcfa0e0
-EBUILD libjpeg-turbo-2.0.6.ebuild 3012 BLAKE2B 98cbdcdef7465e1a6e1d0dc686a4dda0e1891f74fa4e6e9671b5e43d2a342d2b2a70a2aec5c58bc5b1b8d2ccf97286ca5d244a145d5069f739338c68ede2f924 SHA512 d634ff16ba2381d59fa121562d24c88c92f7412a57a68f1edf41126ba4b7ba2ee55d083b37cb4ead615b4460588b0eb90a9b2d98c6dc9e617f2bf6b6363cf5bd
+EBUILD libjpeg-turbo-2.0.6.ebuild 3238 BLAKE2B b249408679a3f8505ffb73ccaa448d3d3dfb94d77b74d82929422f03b7de9fc26e67d01e03bb3277800faff2b444323fcfcacb8f41d390396d236e1d6cb59248 SHA512 2d490158ce49dd55b31d1f5299282cdc632f8e18aff4d402693e28294670f1d39ef257a86bb3ec192c8b67492ea02045311e95965694597a30fb4082cad7418e
 MISC metadata.xml 475 BLAKE2B 00e12208a526ec05edd06341a1f582af2f6cca0ecf4f2de50ff6f1f8d0472c28e6aeaf3994825b90d821144ab351c1f4716a922ac6a454748c76e6c0791b5df2 SHA512 58fadedea7b2a97f0dac0fb0db13cece27a46dfcf2aa2c2bc25ee7ab5ebdd56315d4b465df9cf1b71e4c27588f1398837b5cdb2ea9e2c3caddfb768dd3be13b6
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
index 47751e0823a7..ef4620715867 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
@@ -85,6 +85,11 @@ multilib_src_configure() {
 
 	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
 
+	# mostly for Prefix, ensure that we use our yasm if installed and
+	# not pick up host-provided nasm
+	has_version dev-lang/yasm && ! has_version dev-lang/nasm && \
+		mycmakeargs+=( -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) )
+
 	if use ppc ; then
 		# Workaround recommended by upstream:
 		# https://bugs.gentoo.org/715406#c9
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index ce0e9d87b8be..bf74157426a5 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,16 +1,7 @@
-AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eabbd05201aeff854304fe227f2a83878ed41e5494e71742d46c49b86aa97c3a9b364909f5d6adcc2a3aed21128935febbc7765b90b2f2b3 SHA512 09a61e04dd68674d159c69a497ce412b924967d595526a54693e1999345fd45c88999b5e793b5bfd21a0a555b535d89d1611c44a76f81e1ce308bff821c86f87
-AUX shaderc-2019.0-fix-build-against-new-glslang.patch 2158 BLAKE2B df0c6cc0067ca6b8e2a10e890b7b006680856fa3df2565df3da97759c45445606530e81eee46b1d576d8cdb43b4a84c3241fcd14828c769d418c72f880402c25 SHA512 96d2e6a67a8c38e374b56b16936574e374592eec6b38b2a4fd35ae80419298196a849bfbacc5bf7f1b6175c417ead469b18d2c196147119e490556d49eebc89f
-AUX shaderc-2019.0-fix-glslang-link-order.patch 1030 BLAKE2B 281fc55196762ffbc08daa63a401e13330719c50f9e0f5f30199f9fc96c3c00148eb3a6efb0f4e083eea0a53a19a3f65e0f3e52d995356279a18cf8596029bb3 SHA512 c4fbc5db2a40adc45cdb470c1fc09f65bee38b1f46da84a47c60db3ba081b536539f40567c28111fb598fe6a6ba47602cff3b2835247460d08bab5d5e3ea28c4
 AUX shaderc-2020.1-fix-build.patch 960 BLAKE2B 1124ca1dce0ea480e2af0fd44da957b99a3d8c7d6d759438471b41f50d36d0daf323f68378cbf5b1d53647a5f0494d5de3f7efe71df1dcdb09c9984f0e108d95 SHA512 f299b731c109026d0d8dfa000e377cf48b43a121eff9e5529e91c0bbdf3f54ebd9c692688b23255e8073258b03a3729e0cc3e0904a478a47a448e56b4b27a0ef
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
-DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
-DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
-DIST shaderc-2020.1.tar.gz 276137 BLAKE2B 06466db46b244001c36523ccf218b0485a46864465eda4c605889f65e3acbbbae9f1f7e30c183352f39fb09b1d2b2e87bde26092f1c415de3c55f9d5dde839d2 SHA512 3f53b0be4a15b5b3da0778f2275c7f69579482ee8253b77b4127c4db13a94fbf1e39b3daabafc8642b2d3351acdceed45996af6cbfe310cfaa6cea3a666d828e
 DIST shaderc-2020.2.tar.gz 278161 BLAKE2B 8c8eaf610eb4b6ee44ecf2535eaefe6cca6b39e084293981f1ba50677d8e9d0ee5a88371ccb94696746c830246fac7b48d25568971ee40e504cc4aef57f69320 SHA512 1316445d3310db75b3513ef9cd3012485d945c4b775c29b74d29bb7b7ccad9b2c80dcb4a904eaa6854a3273c569349b186bed8dcc70bc33d6caacfd4c0e12d97
 DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f SHA512 99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2
-EBUILD shaderc-2018.0.ebuild 1972 BLAKE2B 59ff84898d5eb429e0cf2ca5eb102cfd0fe652c4a7b6b44409a245509bbbc99ad69e18d65672b6a53ad5eb6b09f8f987a7f538880f4772c2bcfb785f982939a0 SHA512 0665f70683a796084e2da406c6e650ff3632aacf5318e078eb2de50f3d9b123b14b8b04095186bde791cfadc51befcd7abf3805e87d633b777c893234b81e716
-EBUILD shaderc-2019.0-r1.ebuild 2092 BLAKE2B 6b8a0b3eda40a6de6ca1bd4ab98fcddd6e1fb18e642c0a92d45b776b8f10a802c02d5ce0e4962c8d0e7c00b5f465cd6f2e2f86c8319fb9bc53384507d2e785cf SHA512 7d71e75785b4348976aae21e482e14fab20730cd1b882bcea56206e6c10804b655c80208fb73283007cf625e7f3b72fa3fbbfc9cc40a27eed03d8abc74955098
-EBUILD shaderc-2020.1.ebuild 2011 BLAKE2B 75cc8aebf8d3bdba61d554892a5a9365385e897b4f11c69b142f7d861e3e981f45c2b5feeb86d0d7617d4467eaf60ee291da07b5578a99c0b24611f909d03865 SHA512 3adbcba356cb30e0b42ab804d6ea96ba6e4b901be83c0214f0c7f233405a55df96177c9f3a788832c1e50bb7f4e321d6885ee0c5e4e239502c458e8231673cee
 EBUILD shaderc-2020.2.ebuild 2052 BLAKE2B 95da500f52ef178674c307872f0ea8858e9f9afd926e2c5b06cb9f243c309f7b8675abbf5645891c1008f051fd1abe478c6c7235ec5a45bc336970b90b44d43a SHA512 2464bae776ce827b30db90a398f9b096865a792061bbb699722ff9aef2eb017242ce5062f8af7ddae28eac5950d797c5b72bbb3c2a907aafe047b4fa181d72fd
 EBUILD shaderc-2020.4_pre20201106.ebuild 2165 BLAKE2B 5626b8ccc743239e7c070bf5b3deb0b2e7b84b9dd8fc0cf288ea0ae3ad968806a2ff7f62b4caa23b1ca82072431c947455a90240248166071d335fb9c725b0a9 SHA512 b2d47d0592c8df7a1f768cff7e28ce84c26ac358b8b5cb62c76af50c7732b6f59e49e2b7f041a017d79ea34d2ad25f03c24349a0f3ca9f69d35aa9625a9fc237
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
deleted file mode 100644
index 837303d84e17..000000000000
--- a/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
--  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+  glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
- 
- add_executable(glslc_exe src/main.cc)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 873540a..b189430 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -35,7 +35,7 @@ endif(SHADERC_ENABLE_INSTALL)
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
-   glslang OSDependent OGLCompiler HLSL glslang SPIRV
--  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
-+  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
- 
- shaderc_add_tests(
-   TEST_PREFIX shaderc_util
diff --git a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch b/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
deleted file mode 100644
index 807540cf62a2..000000000000
--- a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
-index 3c3c3de..b5fc6cb 100644
---- a/libshaderc/src/shaderc.cc
-+++ b/libshaderc/src/shaderc.cc
-@@ -20,7 +20,7 @@
- #include <sstream>
- #include <vector>
- 
--#include "SPIRV/spirv.hpp"
-+#include "glslang/SPIRV/spirv.hpp"
- 
- #include "libshaderc_util/compiler.h"
- #include "libshaderc_util/counting_includer.h"
-diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
-index ef7867f..acc172b 100644
---- a/libshaderc_util/src/compiler.cc
-+++ b/libshaderc_util/src/compiler.cc
-@@ -26,7 +26,7 @@
- #include "libshaderc_util/string_piece.h"
- #include "libshaderc_util/version_profile.h"
- 
--#include "SPIRV/GlslangToSpv.h"
-+#include "glslang/SPIRV/GlslangToSpv.h"
- 
- namespace {
- using shaderc_util::string_piece;
-@@ -291,17 +291,12 @@ std::tuple<bool, std::vector<uint32_t>, size_t> Compiler::Compile(
-       bases[static_cast<int>(UniformKind::StorageBuffer)]);
-   shader.setShiftUavBinding(
-       bases[static_cast<int>(UniformKind::UnorderedAccessView)]);
--  shader.setHlslIoMapping(hlsl_iomap_);
-   shader.setResourceSetBinding(
-       hlsl_explicit_bindings_[static_cast<int>(used_shader_stage)]);
-   shader.setEnvClient(target_client_info.client,
-                       target_client_info.client_version);
-   shader.setEnvTarget(target_client_info.target_language,
-                       target_client_info.target_language_version);
--  if (hlsl_functionality1_enabled_) {
--    shader.setEnvTargetHlslFunctionality1();
--  }
--
-   const EShMessages rules = GetMessageRules(target_env_, source_language_,
-                                             hlsl_offsets_,
-                                             generate_debug_info_);
-@@ -478,9 +473,6 @@ std::tuple<bool, std::string, std::string> Compiler::PreprocessShader(
-   }
-   shader.setEnvClient(target_client_info.client,
-                       target_client_info.client_version);
--  if (hlsl_functionality1_enabled_) {
--    shader.setEnvTargetHlslFunctionality1();
--  }
- 
-   // The preprocessor might be sensitive to the target environment.
-   // So combine the existing rules with the just-give-me-preprocessor-output
diff --git a/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
deleted file mode 100644
index 660d1bf8dfd3..000000000000
--- a/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
--  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+  glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
- 
- add_executable(glslc_exe src/main.cc)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index f8ae95d..069c48a 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -32,7 +32,7 @@ add_definitions(-DENABLE_HLSL)
- 
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV
-+  glslang OSDependent OGLCompiler glslang SPIRV HLSL
-   SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
- 
- shaderc_add_tests(
diff --git a/media-libs/shaderc/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild
deleted file mode 100644
index 991a67e2d50b..000000000000
--- a/media-libs/shaderc/shaderc-2018.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-util/glslang-7.10[${MULTILIB_USEDEP}]
-	dev-util/spirv-tools[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/spirv-headers
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${P}-fix-glslang-link-order.patch" )
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make glslc_doc_README
-	fi
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake-utils_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2019.0-r1.ebuild b/media-libs/shaderc/shaderc-2019.0-r1.ebuild
deleted file mode 100644
index 99087b2d869d..000000000000
--- a/media-libs/shaderc/shaderc-2019.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-util/glslang-7.12.3353_pre20191027-r1[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2019.10_pre20191027[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.5.1
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=("${FILESDIR}/${P}-fix-glslang-link-order.patch"
-		 "${FILESDIR}/${P}-fix-build-against-new-glslang.patch" )
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make glslc_doc_README
-	fi
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake-utils_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2020.1.ebuild b/media-libs/shaderc/shaderc-2020.1.ebuild
deleted file mode 100644
index 17392a54f21a..000000000000
--- a/media-libs/shaderc/shaderc-2020.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-util/glslang-8.13.3560_pre20200404[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.3[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.5.3
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-build.patch
-)
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make glslc_doc_README
-	fi
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake-utils_src_install
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 90f9f95fca57..6daf6c11d202 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 7af706de6c04..ff07accbde1d 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,6 @@
 AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
-AUX hydrogen-9999-i18n-path.patch 457 BLAKE2B dde2e8b80ca79f52c05a2512d2d07333cb118c96da92326716533c27908fd68dfb5159a8015a2e3347bb20cc7be96217bba09ec1833cdef06d4d3c2ace8d4aae SHA512 85f974df6d490650562a34dbb4dc126d6b67c85bdf1e91303967714738999a9299e64fdac3492d1b7da4bbccfb1773972888840f54327dba3b4efb0671023841
+AUX hydrogen-9999-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
 DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
 EBUILD hydrogen-1.0.1.ebuild 2111 BLAKE2B 115614e67d1001f2af423710998ee7340838baee2cf67c4289edbdf0ab5ff4423721c2923a7f66b71087ba917dd00c6ca022ca3ce3e69e5fdd7f359701653697 SHA512 c91594162fc4787dfcbafac06985fc2be98370ec773c6284ebe9b822dadb45e70db7ffb66a198653b441e05c42eb7b9b1fb15d12c30c4feca8d59d6b9519e65b
-EBUILD hydrogen-9999.ebuild 2133 BLAKE2B 129548ab21f33bd626ea3b7235ff61471142038109998683dff4aa98884b4fbab2b71c4088297f3ec06924d98eabad62852d58ad2fedb11b49e2a0cd76bd23ee SHA512 5ab310fa51b3a856441b5c332957838aa1725b7da740781dcf56c3a8ab8a08e6760b99a4b9c70ccfa35c741dd6a9bd1fb7e955d18771c4ff2d5fd8551cf32053
+EBUILD hydrogen-9999.ebuild 2090 BLAKE2B 196825b644e659eb72da75ceb97293dfc84014fed26c85df7fe0960409ea3de9df7704ef66480befa4f71619697be4ae892dbd6105ccbec5542f82aac9776b88 SHA512 582742d6990b81e662c315f71012db91df51c1a6b274e0e831b3bdd89d0cfc605192e9d36a7ee5b04c423309735721c0cb3079e457148db1898d1a58dcc2f0c6
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
new file mode 100644
index 000000000000..ef70497abf72
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
@@ -0,0 +1,29 @@
+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 ${CMAKE_SOURCE_DIR}/src/core DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
+-    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
+ ENDIF()
diff --git a/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
deleted file mode 100644
index 3c32e2b3e621..000000000000
--- a/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/data/i18n/CMakeLists.txt	2020-09-07 09:31:57.481066097 +0200
-+++ b/data/i18n/CMakeLists.txt	2020-09-07 09:29:27.612763184 +0200
-@@ -5,4 +5,9 @@
- 
- QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
- ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
--INSTALL(FILES ${QM_FILES} DESTINATION "./data/i18n")
-+
-+IF(MINGW)
-+	INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+ELSE()
-+	INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
-+ENDIF()
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 87e5b809fe3b..aa141dadf063 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -58,8 +58,7 @@ RDEPEND="${CDEPEND}"
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-i18n-path.patch"
+	"${FILESDIR}/${P}-gnuinstalldirs.patch"
 )
 
 src_prepare() {
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 106e2e5b97b1..8b989e47f06f 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest
index 2fefca30c228..6d4c4360c358 100644
--- a/media-tv/w_scan/Manifest
+++ b/media-tv/w_scan/Manifest
@@ -1,5 +1,6 @@
+AUX w_scan-20170107-fno-common.patch 911 BLAKE2B d41b1bdbd25f56789b48a045385810a1f46bd253593360f88cd00bd4b2cfbd3bf6195bc9b80605a907dc6fa77d2bf902f5fd456a106ca1c192d4c63010af4776 SHA512 e1b3c7752a25ae6faff0a90cf77f00aca3871e875d6a5a5cadbf311764a4f51b82141340914dda96152cbc5c6b373b2da89571a4fc57362d6688b6aed5c823d8
 DIST w_scan-20141122.tar.bz2 239277 BLAKE2B eb3afd5977d39ff7c8b4b0c5d85fd57b74cae47f330dd1769a33d3caec2688cd40f8d08c179867042a401db61dfc32494fe2eaed04c790bdb32424cc65ffa3b5 SHA512 64d8d92dd84a5c3cfae4531fbba683602e70597f83ec28c314ccce8810fed70685f03d3e4861d586c52764573e17e0b15881bbdb2f6c60db9d3686d554f1ee6d
 DIST w_scan-20170107.tar.bz2 245517 BLAKE2B 049d555f47935118be26f0bb8a8fc6baa43c273692ff6bc4c95ae912f00f1bda0e5834919c018539b1f891e436ec6556b29ad8c68d69de4a93911e5c7fb265b6 SHA512 c8e163b5e4897e2bc48596a1104974c79807432c423a3dd172e85c6ed6d4f9a4a471150ae7fe1b78fe570987e9fdee666a491700368c8499b03e9b13aa5cde6a
 EBUILD w_scan-20141122.ebuild 677 BLAKE2B 934e0f5e2affa3e77029c1c7b4fe0969e246ddbcde745f78103f2f0fd9c3334fc6a7cbf0be4ce81e03c06d98881be60602ab3cf3f6616ae585ab3b823a1e76d0 SHA512 85f5c1fd201ddee888461a6faf9439fffdd571018ee65bd00612d4f42e5a045e68112c29d9db9bf4f89cced66ed36c0f102b43eb199b910ab59a8073ff3fca7e
-EBUILD w_scan-20170107.ebuild 617 BLAKE2B 35ae1922d32bf2e6321184f1a213867de95e24cf46f38da10d57dc79b9f932def79be6563609b2da533fc0ca88345e127226c43535b7545ead41e439128ce853 SHA512 c2c626e00d57d2d2932c3034e63d67604bdf102255645d5136ad34ef5a4f9cba6ba3f726d6f6f04d3f7edbcdaa203534bab6d8039112e9d4df3590736d10d3f2
+EBUILD w_scan-20170107.ebuild 609 BLAKE2B b0a890af43e77de1d58ba0bb71b6a846d9fbeb3a371fc647c403c3f2c5eb8612181860c42b4044a7fa1fc3b83d238b0f1988e5036790c765a3a21f6bf5b3ea3c SHA512 d8b401faf350109ab18935d9c4b71ff6dda47f3ee298a0d5d545fc472841ce9215f3648dd04c2811da080af5db0f5490b69ce39c1aa3e5e2beffac6bc0f49b5a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-tv/w_scan/files/w_scan-20170107-fno-common.patch b/media-tv/w_scan/files/w_scan-20170107-fno-common.patch
new file mode 100644
index 000000000000..43bd7144eeb3
--- /dev/null
+++ b/media-tv/w_scan/files/w_scan-20170107-fno-common.patch
@@ -0,0 +1,24 @@
+Taken from: https://git.buildroot.net/buildroot/tree/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch?id=2e8bf36dc4421f2213f8fa6de91b2c9bf3d64e45
+Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+
+--- w_scan-20170107.orig/si_types.h	2020-09-20 11:09:56.776963441 +0200
++++ w_scan-20170107/si_types.h	2020-09-20 11:13:13.149232478 +0200
+@@ -114,7 +114,7 @@
+   uint32_t logical_channel_number;
+   uint8_t  running;
+   void   * priv;
+-} service_t, * p_service_t;
++};
+ 
+ /*******************************************************************************
+ /* transponder type.
+@@ -201,7 +201,7 @@
+   /*----------------------------*/
+   char * network_name;
+   network_change_t network_change;
+-} __attribute__((packed))  transponder_t, * p_transponder_t;
++} __attribute__((packed));
+ 
+ /*******************************************************************************
+ /* satellite channel routing type.
+
diff --git a/media-tv/w_scan/w_scan-20170107.ebuild b/media-tv/w_scan/w_scan-20170107.ebuild
index 0b7e605bf66c..926e92f2c2cb 100644
--- a/media-tv/w_scan/w_scan-20170107.ebuild
+++ b/media-tv/w_scan/w_scan-20170107.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Scan DVB-C/DVB-T/DVB-S channels"
 HOMEPAGE="http://wirbel.htpc-forum.de/w_scan/index2.html"
@@ -13,12 +13,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
 DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
-RDEPEND=""
 
-src_install() {
-	emake DESTDIR="${D}" install
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
-	dodoc ChangeLog README
+src_install() {
+	default
 
 	if use doc; then
 		dodoc doc/README.file_formats doc/README_VLC_DVB
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index be6a89d62dee..758a601275e5 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 33c86b0deebf..5fe6dcf6fe11 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,6 +6,6 @@ DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917
 DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876bd1001ad185384fcabb3d0ae196c9ba591e680823b3c7b6e0ef9a0a9e9575a8b08439fdd89ef0e4dabb9d4a7f4e6 SHA512 5c74e3fe77ddf8ffede0e4692d574858dd0626e542380a819ab79c0f669c6c1329ffbccb872502f60306e561f10aa8bc1e61d09b2bea829870fe4a48b76460c6
 DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65d4ab79ef4cfae94fe594048eaa37eec47724d119863102a7211c2178f5a2382a6d4016b792818079b8241bde084 SHA512 831a187d8b8f2715a9f11c93c8d3ec126ff579d470797da452d3395178877de113af7ae90ed27fca0b223791ad257972570481e6dbb8361d2b7f3b010924bee8
 EBUILD ffmpeg-4.2.4.ebuild 18169 BLAKE2B b771bf50bfce5c754963f431f085c29b962bed73e55e805e112986281abf025cf7723e8cdc5f15829d06424aadbc6899c644f5e4ca56a2a113920a13c5c8b13b SHA512 b26527dc7e5c46dbe8b958efd4d5ebd51d91e258c2a6b23d1d9c9fcc4ddbbe72f1ad9751b8dd9273ebd0840003db83db16babc15ca844e33df2a06ac16add793
-EBUILD ffmpeg-4.3.1.ebuild 18212 BLAKE2B b4ed0b43602885d1d3b728f77350282af5bf96897e7d900d038f8ba18b0ebd2972f585a8b01f51d21c51bdff47785991a1df56767886abc201c40cd1914849dc SHA512 12b5ffe8ea6fdf5dfb4d4f73086f1d0ea5b6d41ec327b45d1077f2113ee31a5437dc1805b417aefbe14a50e25a303604d93ac2ab1b69d2eb33eedcaad2dc3c99
+EBUILD ffmpeg-4.3.1.ebuild 18218 BLAKE2B d22f2388930330bbfa0605a2c3f309b75b13a74ee9bfde34b023cb545b388cdc720445c3b2e98bd0440f029aa343fcc1bbe0840eef479ec1bfd861ef022ca5dd SHA512 506b47849f8efbba6a4ffe3e3913303be7a06da20531ae3e63fdf87d34f6c3c81bcd26dcf220878c090b77e56aebc15225327a54391ee1ef475c776a778a5c26
 EBUILD ffmpeg-9999.ebuild 18049 BLAKE2B 3d1ebb9b9ce4abc8e5db6da31e600a9db93580a4fa876dde23e0ae4623a3aceba9351b40637d8a6ecc60f0f15c62c438fd8445633e325eaff25c69b64438927a SHA512 dce9ed532ac8a084c03e4d27898de3d5b9fc9afa577d1312e1c157657a3f372faaa594aa83006ec6397ef9cc35b684ce37865a2a0c59624ee88481026be00d1f
 MISC metadata.xml 5868 BLAKE2B afe06c266a6dce5dc2b13a1dcaae85c4288a4f45ef493d9b865bf476a624fb188ebab686708049149f1eac94e434b926b185d1bf0467f26f62f641a0f832dd22 SHA512 8b85ed0ba2d98135b3b2f7f4e13b7fcff52cd4238fa429e355c4e2033e51d945d8363ecf2bf73c0569e5a071a793bb01cd716113e4672603867a01d258d4aa77
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
index da8caf3ad3da..7c722389ec2b 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 5b5de8531ccb..db3e1b0c6844 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,6 +11,6 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de68
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
 DIST mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081
 EBUILD mplayer-1.3.0-r6.ebuild 16920 BLAKE2B 95895b1bbe6b6699bbf1995a4cf451b04ca8c8d572260df33f1ada8f253aa6f4fd9958b8ffc7c59699e8f6251ce1b6ae60428594abec66db64c683961863d075 SHA512 0afc5fa912d3ef3654f0ef1acd27e64a0f861f9f01f78ba82c58d44e99faae6bcc2ea0c30a0235672d90ccd0fc66734131773f771d2917c647ec31fe3ec4ecd9
-EBUILD mplayer-1.4-r1.ebuild 16602 BLAKE2B fc8b48e1540c292b72b8665af41f949f5eb18d8eb7a2f054b230fd52173a0e98d6579049b241ee06e01f197b17345d6654fb69c1c8ef8c86aa4fc8d9b7b8f427 SHA512 cd03239376773c344cf9eb0b9b9a9e347cf23992f089d233f00872feecda395164bca9f4177bd7f6995f05b910c36a07e6300e11cff230bf99c78089c8df7b5c
+EBUILD mplayer-1.4-r1.ebuild 16601 BLAKE2B 4db40aceb84b4b0b9534262f68778d9b80ee6eadd8a83b54d983c159039dd7be673906f3da308905ef6acfce54818c95ba95b2344ba4f668031990ee85b48d17 SHA512 b78c9abe4dc26e7bc1eb739e3bf0a11cdeda134cbac78e16eae45f77515d201b3607d2170502ae1a49991a1eb2f3a35442cf15046403613c9d0f6462ddf781fb
 EBUILD mplayer-9999.ebuild 16605 BLAKE2B 6b3f209bf2f31916826175b0806a254e5ccf8d2682f475e1d369cc10b0185b4646d63bce73cefe74164fc41e37c4d7f91c60dde71d2cc326e2622c951916e642 SHA512 870df76b212b44662ab0e1a99681d2ec5bc212aaad5b6822ce197b75a8ea0682bdd02ce7cd0452d38f5f41232f770f82a35af11775e63596896a96072eebff20
 MISC metadata.xml 2536 BLAKE2B 1a8ff751e68c46c921cd09a9364e8046372cf0a77aaf062c26ed1356eebfaa8b90eb36cac6e101fe22f9f7ddcec611806271683e76d53c642dfc1fc87ba0baa5 SHA512 01fadd14038f9bda1fb3b521f65ab92e2cfed58628352b02f26dfef710d4d5a6fd964ef00e3a123a76046557b15ae29bc7c221c5a8a692cb06763e478b3b58c7
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index 9cc733836427..6be49c30001b 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 # faac codecs are nonfree
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index ee5556e3a78d..de85e324b521 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,8 +3,10 @@ DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1f
 DIST pipewire-0.3.10.tar.gz 1148297 BLAKE2B d890b8e6697b17be9f8706a7228b9c79631120550ac51d7fbea8b5d05ca161ce6142a5666a6a61db618d4da0519676160ba1180cf9274865d879f4bb0da2a8e7 SHA512 f2f3dd7ce9b9f3a5ab55b6da97cd64419dad5115714848ce8893795c0ed2fd2fe0059240ec9fe1c92fb1442caf8d7071e415afe6712500be1c29fd001293cf0d
 DIST pipewire-0.3.13.tar.gz 1176949 BLAKE2B 5a4c7f211c1ac3c823cc34cede2f42204a2a7c6d583237465e702936926fad924c37f0638c8bbdedc55ad70d59cc2796e64b2b3dea2c64f199383d4ed9c1c84a SHA512 38ce7d8808e69935db0148c077340cfbc1b85f5a016a0a57eff2c076560c42f0695cfe681c9f16ebf15796d773dd113c9a84631eb50ac44dfb09f91ed3fc61f0
 DIST pipewire-0.3.15.tar.gz 1227022 BLAKE2B 590c5275d98a38c238f8c63d5bcdc9dbab07e870aff0e7414e0894aeb93507c106b7b45cd70b0f44a077b2fc5bd916c764dc4e03a54926f90a3296d870b7bcaa SHA512 949f2e64a3e9ec06b3414cacfbd7cf4ef6b7bad484a5dea1b79b5d4310413ec5a7538b702431f2cf6fb580ffd430081bd568399faa9b819689a79bebc955ca33
+DIST pipewire-0.3.17.tar.gz 1254486 BLAKE2B e6a8e31dc968b95012f01dce53faa30dde40b3a382fe85eb25a50b96f3d011711be1f9fc5ce42e355c19f92e59bdaa4e5b6ecf41347f400c35adb3eeb2a53c5c SHA512 0de4f2431cf19708c3457877b8172a39676ef8f748071921a21da391d95b83a870190dc1343ffe9000e2599431464b6bfe90219f6237493903ccba5eb9b3473d
 EBUILD pipewire-0.2.7.ebuild 1650 BLAKE2B 3e94b6c00adb56c37e01df3f0adafc7d0d2115b2a27a1da3622245731ee341550f8bc8421e7d85693ca41a0a2ba17c192c06017f59e62bcd758babaf4bedfa20 SHA512 f924725947d243452b8bec1f03f7d113de2d4668ef3db18b2922a4b1695c87d4ac9def44e2d79d38fac3013a09dadb84af11fe8dc9aec4fe0ba475340f17b295
 EBUILD pipewire-0.3.10.ebuild 3386 BLAKE2B 4567234b2ff098c6fdb853fa7df9922d1712de2b50845f84d411ca73b46b38e601dc29589edcd7b181e175964101a8b182ab42e9333ba9de5dcc3ad0abaa7a5f SHA512 75714d9c10a79464cd017531900fb4100b83dae4a2858669444c25badeef4bcdbbe685ef7f73c817f102d3b776b55fdbcb64e3a7578a82d073d5f3cabfa2ece6
 EBUILD pipewire-0.3.13.ebuild 3389 BLAKE2B 61426a7a2d1cce9442eae8a937cc3a1046c1b09c0ab02eac2dc53b4a66ac313186cdd41ce751e07c9c7614deca0cf0bf4bae25aa31190624ae762f8e123a590c SHA512 fbfb5fd2a1583ce61e76360272ad865c7a683ef225883ac0f94b1d99fa8a291f920498c463749e3f4e4b71be569194ce36ec0c9113ae9ab1de9b8f284b4f0f3e
 EBUILD pipewire-0.3.15.ebuild 3427 BLAKE2B c2ac1b35d25ecd0e79e04fe22b8d6947a1fba024bc788bbb2833bafa694f8ec0ffccaf8c36f507fefcecd266e42eb344560f817d21aada97a34bdf481223dc61 SHA512 3f2ab1b3cda626d7107f9b9d00bab2a4f7b27c5baa4a794fe9662d90fc1ddd7eb51b54b5214b85ca4e8e5007c332029bfd8d3b8b87aae4d71178b7e0ddfb27e4
+EBUILD pipewire-0.3.17.ebuild 3427 BLAKE2B c2ac1b35d25ecd0e79e04fe22b8d6947a1fba024bc788bbb2833bafa694f8ec0ffccaf8c36f507fefcecd266e42eb344560f817d21aada97a34bdf481223dc61 SHA512 3f2ab1b3cda626d7107f9b9d00bab2a4f7b27c5baa4a794fe9662d90fc1ddd7eb51b54b5214b85ca4e8e5007c332029bfd8d3b8b87aae4d71178b7e0ddfb27e4
 MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
diff --git a/media-video/pipewire/pipewire-0.3.17.ebuild b/media-video/pipewire/pipewire-0.3.17.ebuild
new file mode 100644
index 000000000000..ddd42bd689c4
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.17.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
+	EGIT_BRANCH="work"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	>=media-libs/alsa-lib-1.1.7
+	media-libs/libsdl2
+	>=media-libs/libsndfile-1.0.20
+	sys-apps/dbus
+	virtual/libudev
+	bluetooth? (
+		media-libs/sbc
+		net-wireless/bluez:=
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack? ( >=media-sound/jack2-1.9.10:2 )
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-11.1
+	)
+	systemd? ( sys-apps/systemd )
+	vulkan? ( media-libs/vulkan-loader )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	spa_use() {
+		if ! in_iuse ${1} || ! use ${1}; then
+			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-i src/daemon/pipewire.conf.in || die
+		fi
+	}
+
+	default
+	spa_use libcamera
+	spa_use rtkit
+	spa_use bluetooth bluez5
+	spa_use jack
+	spa_use vulkan
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dexamples=true # contains required pipewire-media-session
+		-Dman=true
+		-Dspa-plugins=true
+		--buildtype=$(usex debug debugoptimized plain)
+		# alsa plugin and jack/pulseaudio emulation
+		-Dpipewire-alsa=true
+		$(meson_use jack pipewire-jack)
+		$(meson_use pulseaudio pipewire-pulseaudio)
+		# spa-plugins
+		# we install alsa support unconditionally
+		$(meson_use bluetooth bluez5)
+		$(meson_use ffmpeg)
+		$(meson_use jack)
+		$(meson_use vulkan)
+		# libcamera is not packaged
+		# misc
+		$(meson_use doc docs)
+		$(meson_use gstreamer)
+		$(meson_use gstreamer gstreamer-device-provider)
+		$(meson_use systemd)
+		$(meson_use test test)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+
+# 	# TODO: this breaks alsa users
+# 	if use alsa; then
+# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+# 	fi
+}
+
+pkg_postinst() {
+	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
+	elog "by setting DISABLE_RTKIT env var."
+	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
+	elog
+	if use jack; then
+		elog "Please note that even though the libraries for JACK emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
+		elog
+	fi
+	if use pulseaudio; then
+		elog "Please note that even though the libraries for PulseAudio emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
+		elog
+	fi
+	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 2825a1f75b2b..6cc140242460 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 23b445252e74..26a4e69091e7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Nov 2020 07:08:38 +0000
+Sun, 29 Nov 2020 09:08:36 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c06aa4ba1349..e849ba543c93 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 490524 BLAKE2B be35a1d153e1ba81293ae8ab5c825660ca94c79791160c09b03110828197671a59a74fda786aa87df0a823f5f18368ee4bdb024182195c06d7785f78d4cdfc02 SHA512 92605b968213805888bbe32f28bff22d2b23ff8e28d68962bb98d751b39f639824fc3891bdf662b3c74e0cdbff6403326e6a81180cc9ca128519d4ae6770b3d7
-TIMESTAMP 2020-11-28T07:08:42Z
+TIMESTAMP 2020-11-29T09:08:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/B93pfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/DZRdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBV+RAApuZ4tK/FkFj48pmODsVSkTrELBOLtlNa7m+XFszc9+yWSFYoXzo3gm+N
-d+kJAh96Wus5m587wlZwAYdXxrfPvQrXRMp9EG7Oxg/lHYmO0Zbdg//7u+mSTg2D
-+ReZPAEecGqQWtdZ5l3aOJibZT+keChYV79jigdfJ0Xquo5QqWn1T+qrMsas2wAm
-eGsYzEAu5vNqNWU2UgZDznGRZJDsK2RrhgFW/jKbZyaZxjwwozhOXeQYzc0hZtTk
-1ozFwlC7f56vWoIlpLmSvZMxTCjAg06hENHyZMJEOL9huI53F97uj7D4MuaVmBJf
-Q7NspzgrkQiE/HOSUvMjiOFIxF7wW0lN2ICI/Tq5TY1GbQsGo/SHuC3JAZAnQdJ4
-6uoLr39UZn8zVQvlnMphDSa1teHCCEtSHlRd5Ifqmq7nVSDYq1W5qjXgWcn1i3Qj
-7QhmgsDXt1efMXf8lqoGsIslNWlR92ab64iKaEdm/p47It0IOej5XitTwYOcpyzH
-aNywvDBfng6FKM+XzxNV43foeaFOjbJVl2nTfqrNnpDOcQ1T0Kv8YNKdWqWFKxTf
-cN9eDXhZvJ49we0tZG8lxhoVSq4kpRDDUUAF3mjrP+63mHQVQ1lmGuRKjYynxM3b
-r+JM9UUGCVcsbANJUDwu/iAeerUlJDeXVs5YyGjs+KvVjWOKG+M=
-=Qw8U
+klCSAQ//YfgHzeUMVjQZVnH1m7Yo3SjKzy/23BXlMNbbw5f5R42e4/eLAWJgWJ3i
+uvziX0KmDYtgr3k8pmZdLht1lLC+DEXM/PSHGOsyNO0n7t07Vjm2+xQmnc32uI4g
+JnUVSROpPlqJfvuO1n4o9Ax/D/St/pDqM/36z64VPM8XVlBQY7HOp0afKJ3v9NwW
+fFpVtB7xOE9RSeL8sqJEkfGiKBwA7+iD6mM1oVXi4aTBZocDq1YqtZ4xma7FZ0HQ
+xNa/Etqn/99jeYrTLYjnx6bThULDHYO5cUi+0y7/4n/GtXcJxwsGQVZwVrbbzaFL
+iN/Q/8aIGQcmLiiVGNS6u5luvWhIp0QnraUlju225r1DY+DZroCTbeFGlOvvfK9x
+M8bUprjanTyA32eSfuOoPE/OiIYw59iu8pkRKuzm+0uHoFDf7qBttJO6GT7KPoMN
+GtgP0pj4PZNPJZMIJuRGW6kIuoSKYPMh8qwP815JnK4R1oOIv23FydySBwA/jkus
+9nGOnbWethznMZwfOBHB7Izhup00wNrWK1dldHiQSQemPpJHmREibQETedM0h2Si
+QndZK3endjz/3ytuQ5yBlDcTuu3+L/nqAqLrNLcHBOJfZdectVoxjAgv+HaQZY1O
+jYZm9pyOVkyLGrsQRT6KWnSv4P1q0BgiAHSABu10YojT1p7PnhA=
+=dCW6
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 5cc4f5563aa0..26a4e69091e7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Nov 2020 07:08:39 +0000
+Sun, 29 Nov 2020 09:08:36 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 546b2ee62c34..fb91fde52315 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 816a48afd894..7ff7af20ccd0 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/sniproxy-0 b/metadata/md5-cache/acct-group/sniproxy-0
new file mode 100644
index 000000000000..72a0378d66fa
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sniproxy-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: sniproxy
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	c7c2102da2c8db70657be99a7add9c06	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=8a3e5a7030b2dd9512ed57773312b131
diff --git a/metadata/md5-cache/acct-group/ziproxy-0 b/metadata/md5-cache/acct-group/ziproxy-0
new file mode 100644
index 000000000000..d179608815a2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ziproxy-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: ziproxy
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	c7c2102da2c8db70657be99a7add9c06	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=0df45d03f441d5b95c89b7928a2bb39a
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 38d6b5fec926..e3ea9a7fd69a 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/sniproxy-0 b/metadata/md5-cache/acct-user/sniproxy-0
new file mode 100644
index 000000000000..abdaaab289b8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sniproxy-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: sniproxy
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/sniproxy
+SLOT=0
+_eclasses_=acct-user	4e8cbda4e2f81e96d4113bcf7547e6ba	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=85ddff8dfe5293ccfd99344fcaabef8f
diff --git a/metadata/md5-cache/acct-user/ziproxy-0 b/metadata/md5-cache/acct-user/ziproxy-0
new file mode 100644
index 000000000000..676dd47779ec
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ziproxy-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: ziproxy
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/ziproxy
+SLOT=0
+_eclasses_=acct-user	4e8cbda4e2f81e96d4113bcf7547e6ba	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=a9eb5ded26a2797ecba61be37d1fbc09
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 1844f6c401f9..765981fd43eb 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/helm-2.16.1 b/metadata/md5-cache/app-admin/helm-2.16.1
deleted file mode 100644
index 0a0e2c958ad6..000000000000
--- a/metadata/md5-cache/app-admin/helm-2.16.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.12 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Package Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/helm/archive/v2.16.1.tar.gz -> helm-2.16.1.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/8c41231e01b2085512d98153bcffb847ff9b4b9f.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-8c41231e01b2085512d98153bcffb847ff9b4b9f.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-ansiterm/archive/d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz -> github.com-Azure-go-ansiterm-d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz https://github.com/Azure/go-autorest/archive/69b4126ece6b5257e2f9b0017007d2334153655f.tar.gz -> github.com-Azure-go-autorest-69b4126ece6b5257e2f9b0017007d2334153655f.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/BurntSushi/toml/archive/3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz -> github.com-BurntSushi-toml-3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz https://github.com/chai2010/gettext-go/archive/c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz -> github.com-chai2010-gettext-go-c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz https://github.com/cpuguy83/go-md2man/archive/7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19.tar.gz -> github.com-cpuguy83-go-md2man-7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19.tar.gz https://github.com/cyphar/filepath-securejoin/archive/a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz -> github.com-cyphar-filepath-securejoin-a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz https://github.com/davecgh/go-spew/archive/8991bc29aa16c548c550c7ff78260e27b9ab7c73.tar.gz -> github.com-davecgh-go-spew-8991bc29aa16c548c550c7ff78260e27b9ab7c73.tar.gz https://github.com/dgrijalva/jwt-go/archive/06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz -> github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz https://github.com/docker/distribution/archive/2461543d988979529609e8cb6fca9ca190dc48da.tar.gz -> github.com-docker-distribution-2461543d988979529609e8cb6fca9ca190dc48da.tar.gz https://github.com/docker/docker/archive/be7ac8be2ae072032a4005e8f232be3fc57e4127.tar.gz -> github.com-docker-docker-be7ac8be2ae072032a4005e8f232be3fc57e4127.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/evanphx/json-patch/archive/5858425f75500d40c52783dce87d085a483ce135.tar.gz -> github.com-evanphx-json-patch-5858425f75500d40c52783dce87d085a483ce135.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/color/archive/3f9d52f7176a6927daacff70a3e8d1dc2025c53e.tar.gz -> github.com-fatih-color-3f9d52f7176a6927daacff70a3e8d1dc2025c53e.tar.gz https://github.com/ghodss/yaml/archive/c7ce16629ff4cd059ed96ed06419dd3856fd3577.tar.gz -> github.com-ghodss-yaml-c7ce16629ff4cd059ed96ed06419dd3856fd3577.tar.gz https://github.com/gofrs/flock/archive/392e7fae8f1b0bdbd67dad7237d23f618feb6dbb.tar.gz -> github.com-gofrs-flock-392e7fae8f1b0bdbd67dad7237d23f618feb6dbb.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/65acae22fc9d1fe290b33faa2bd64cdc20a463a0.tar.gz -> github.com-gogo-protobuf-65acae22fc9d1fe290b33faa2bd64cdc20a463a0.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/6c65a5562fc06764971b7c5d05c76c75e84bdbf7.tar.gz -> github.com-golang-protobuf-6c65a5562fc06764971b7c5d05c76c75e84bdbf7.tar.gz https://github.com/google/btree/archive/4030bb1f1f0c35b30ca7009e9ebd06849dd45306.tar.gz -> github.com-google-btree-4030bb1f1f0c35b30ca7009e9ebd06849dd45306.tar.gz https://github.com/google/go-cmp/archive/6f77996f0c42f7b84e5a2b252227263f93432e9b.tar.gz -> github.com-google-go-cmp-6f77996f0c42f7b84e5a2b252227263f93432e9b.tar.gz https://github.com/google/gofuzz/archive/f140a6486e521aad38f5917de355cbf147cc0496.tar.gz -> github.com-google-gofuzz-f140a6486e521aad38f5917de355cbf147cc0496.tar.gz https://github.com/google/uuid/archive/0cd6bf5da1e1c83f8b45653022c74f71af0538a4.tar.gz -> github.com-google-uuid-0cd6bf5da1e1c83f8b45653022c74f71af0538a4.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/c2d73b246b48e239d3f03c455905e06fe26e33c3.tar.gz -> github.com-gophercloud-gophercloud-c2d73b246b48e239d3f03c455905e06fe26e33c3.tar.gz https://github.com/gosuri/uitable/archive/2cf933346b8370a3a3d8867ef5cf54b2129d8ecf.tar.gz -> github.com-gosuri-uitable-2cf933346b8370a3a3d8867ef5cf54b2129d8ecf.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/6af20e3a5340d5e6bde20c8a7a78699efe19ac0a.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-6af20e3a5340d5e6bde20c8a7a78699efe19ac0a.tar.gz https://github.com/hashicorp/golang-lru/archive/7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz -> github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz https://github.com/huandu/xstrings/archive/f02667b379e2fb5916c3cda2cf31e0eb885d79f8.tar.gz -> github.com-huandu-xstrings-f02667b379e2fb5916c3cda2cf31e0eb885d79f8.tar.gz https://github.com/imdario/mergo/archive/9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz -> github.com-imdario-mergo-9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jmoiron/sqlx/archive/d161d7a76b5661016ad0b085869f77fd410f3e6a.tar.gz -> github.com-jmoiron-sqlx-d161d7a76b5661016ad0b085869f77fd410f3e6a.tar.gz https://github.com/json-iterator/go/archive/27518f6661eba504be5a7a9a9f6d9460d892ade3.tar.gz -> github.com-json-iterator-go-27518f6661eba504be5a7a9a9f6d9460d892ade3.tar.gz https://github.com/konsorten/go-windows-terminal-sequences/archive/5c8c8bd35d3832f5d134ae1e1e375b69a4d25242.tar.gz -> github.com-konsorten-go-windows-terminal-sequences-5c8c8bd35d3832f5d134ae1e1e375b69a4d25242.tar.gz https://github.com/lib/pq/archive/f91d3411e481ed313eeab65ebfe9076466c39d01.tar.gz -> github.com-lib-pq-f91d3411e481ed313eeab65ebfe9076466c39d01.tar.gz https://github.com/liggitt/tabwriter/archive/89fcab3d43de07060e4fd4c1547430ed57e87f24.tar.gz -> github.com-liggitt-tabwriter-89fcab3d43de07060e4fd4c1547430ed57e87f24.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/goutils/archive/41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0.tar.gz -> github.com-Masterminds-goutils-41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0.tar.gz https://github.com/Masterminds/semver/archive/805c489aa98f412e79eb308a37996bf9d8b1c91e.tar.gz -> github.com-Masterminds-semver-805c489aa98f412e79eb308a37996bf9d8b1c91e.tar.gz https://github.com/Masterminds/sprig/archive/e4c0945838d570720d876a6ad9b4568ed32317b4.tar.gz -> github.com-Masterminds-sprig-e4c0945838d570720d876a6ad9b4568ed32317b4.tar.gz https://github.com/Masterminds/vcs/archive/f94282d8632a0620f79f0c6ff0e82604e8c5c85b.tar.gz -> github.com-Masterminds-vcs-f94282d8632a0620f79f0c6ff0e82604e8c5c85b.tar.gz https://github.com/mattn/go-colorable/archive/98ec13f34aabf44cc914c65a1cfb7b9bc815aef1.tar.gz -> github.com-mattn-go-colorable-98ec13f34aabf44cc914c65a1cfb7b9bc815aef1.tar.gz https://github.com/mattn/go-isatty/archive/0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a.tar.gz -> github.com-mattn-go-isatty-0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a.tar.gz https://github.com/mattn/go-runewidth/archive/9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf.tar.gz -> github.com-mattn-go-runewidth-9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/mitchellh/copystructure/archive/9a1b6f44e8da0e0e374624fb0a825a231b00c537.tar.gz -> github.com-mitchellh-copystructure-9a1b6f44e8da0e0e374624fb0a825a231b00c537.tar.gz https://github.com/mitchellh/go-wordwrap/archive/9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c.tar.gz -> github.com-mitchellh-go-wordwrap-9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c.tar.gz https://github.com/mitchellh/reflectwalk/archive/3e2c75dfad4fbf904b58782a80fd595c760ad185.tar.gz -> github.com-mitchellh-reflectwalk-3e2c75dfad4fbf904b58782a80fd595c760ad185.tar.gz https://github.com/modern-go/concurrent/archive/bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz -> github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz https://github.com/modern-go/reflect2/archive/94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz -> github.com-modern-go-reflect2-94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz https://github.com/opencontainers/go-digest/archive/279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz -> github.com-opencontainers-go-digest-279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/pkg/errors/archive/27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7.tar.gz -> github.com-pkg-errors-27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7.tar.gz https://github.com/prometheus/client_golang/archive/505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz -> github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz https://github.com/prometheus/client_model/archive/5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz -> github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz https://github.com/prometheus/common/archive/4724e9255275ce38f7179b2478abeae4e28c904f.tar.gz -> github.com-prometheus-common-4724e9255275ce38f7179b2478abeae4e28c904f.tar.gz https://github.com/prometheus/procfs/archive/1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz -> github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/rubenv/sql-migrate/archive/9355dd04f4b3dc9ed604623307307a3491a627bc.tar.gz -> github.com-rubenv-sql-migrate-9355dd04f4b3dc9ed604623307307a3491a627bc.tar.gz https://github.com/russross/blackfriday/archive/05f3235734ad95d0016f6a23902f06461fcf567a.tar.gz -> github.com-russross-blackfriday-05f3235734ad95d0016f6a23902f06461fcf567a.tar.gz https://github.com/sirupsen/logrus/archive/839c75faf7f98a33d445d181f3018b5c3409a45e.tar.gz -> github.com-sirupsen-logrus-839c75faf7f98a33d445d181f3018b5c3409a45e.tar.gz https://github.com/spf13/cobra/archive/f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5.tar.gz -> github.com-spf13-cobra-f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5.tar.gz https://github.com/spf13/pflag/archive/2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab.tar.gz -> github.com-spf13-pflag-2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab.tar.gz https://github.com/technosophos/moniker/archive/a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz -> github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz https://github.com/golang/crypto/archive/e84da0312774c21d64ee2317962ef669b27ffb41.tar.gz -> github.com-golang-crypto-e84da0312774c21d64ee2317962ef669b27ffb41.tar.gz https://github.com/golang/net/archive/cdfb69ac37fc6fa907650654115ebebb3aae2087.tar.gz -> github.com-golang-net-cdfb69ac37fc6fa907650654115ebebb3aae2087.tar.gz https://github.com/golang/oauth2/archive/9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz -> github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz https://github.com/golang/sync/archive/42b317875d0fa942474b76e1b46a6060d720ae6e.tar.gz -> github.com-golang-sync-42b317875d0fa942474b76e1b46a6060d720ae6e.tar.gz https://github.com/golang/sys/archive/b90733256f2e882e81d52f9126de08df5615afd9.tar.gz -> github.com-golang-sys-b90733256f2e882e81d52f9126de08df5615afd9.tar.gz https://github.com/golang/text/archive/e6919f6577db79269a6443b9dc46d18f2238fb5d.tar.gz -> github.com-golang-text-e6919f6577db79269a6443b9dc46d18f2238fb5d.tar.gz https://github.com/golang/time/archive/f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz -> github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz https://github.com/golang/appengine/archive/54a98f90d1c46b7731eb8fb305d2a321c30ef610.tar.gz -> github.com-golang-appengine-54a98f90d1c46b7731eb8fb305d2a321c30ef610.tar.gz https://github.com/google/go-genproto/archive/919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0.tar.gz -> github.com-google-go-genproto-919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0.tar.gz https://github.com/grpc/grpc-go/archive/a02b0774206b209466313a0b525d2c738fe407eb.tar.gz -> github.com-grpc-grpc-go-a02b0774206b209466313a0b525d2c738fe407eb.tar.gz https://github.com/go-gorp/gorp/archive/6a667da9c028871f98598d85413e3fc4c6daa52e.tar.gz -> github.com-go-gorp-gorp-6a667da9c028871f98598d85413e3fc4c6daa52e.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/square/go-jose/archive/e94fb177d3668d35ab39c61cbb2f311550557e83.tar.gz -> github.com-square-go-jose-e94fb177d3668d35ab39c61cbb2f311550557e83.tar.gz https://github.com/go-yaml/yaml/archive/f221b8435cfb71e54062f6c6e99e9ade30b124d5.tar.gz -> github.com-go-yaml-yaml-f221b8435cfb71e54062f6c6e99e9ade30b124d5.tar.gz https://github.com/kubernetes/api/archive/35e52d86657aba06859dd22099bfa14faf1effb2.tar.gz -> github.com-kubernetes-api-35e52d86657aba06859dd22099bfa14faf1effb2.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/5357c4baaf6562e4d37c9afc9fef99bd16d76a9f.tar.gz -> github.com-kubernetes-apiextensions-apiserver-5357c4baaf6562e4d37c9afc9fef99bd16d76a9f.tar.gz https://github.com/kubernetes/apimachinery/archive/a2eda9f80ab8a454a81bdde16d62a1afe5f931c0.tar.gz -> github.com-kubernetes-apimachinery-a2eda9f80ab8a454a81bdde16d62a1afe5f931c0.tar.gz https://github.com/kubernetes/apiserver/archive/5190913f932d82e562d4eb91d0f3d7a063bdbc07.tar.gz -> github.com-kubernetes-apiserver-5190913f932d82e562d4eb91d0f3d7a063bdbc07.tar.gz https://github.com/kubernetes/client-go/archive/bec269661e48cb1e5fbb0d037f356ffe9e9978a0.tar.gz -> github.com-kubernetes-client-go-bec269661e48cb1e5fbb0d037f356ffe9e9978a0.tar.gz https://github.com/kubernetes/cli-runtime/archive/74ad18325ed51ea6de9ee19bae59156bad18ecd2.tar.gz -> github.com-kubernetes-cli-runtime-74ad18325ed51ea6de9ee19bae59156bad18ecd2.tar.gz https://github.com/kubernetes/component-base/archive/039242c015a9f5eeaccea3ea17c6973b9c27166a.tar.gz -> github.com-kubernetes-component-base-039242c015a9f5eeaccea3ea17c6973b9c27166a.tar.gz https://github.com/kubernetes/klog/archive/3ca30a56d8a775276f9cdae009ba326fdc05af7f.tar.gz -> github.com-kubernetes-klog-3ca30a56d8a775276f9cdae009ba326fdc05af7f.tar.gz https://github.com/kubernetes/kube-openapi/archive/743ec37842bffe49dd4221d9026f30fb1d5adbc4.tar.gz -> github.com-kubernetes-kube-openapi-743ec37842bffe49dd4221d9026f30fb1d5adbc4.tar.gz https://github.com/kubernetes/kubectl/archive/2ed914427d51f6fd865e0db43d72b2f22610cf32.tar.gz -> github.com-kubernetes-kubectl-2ed914427d51f6fd865e0db43d72b2f22610cf32.tar.gz https://github.com/kubernetes/kubernetes/archive/c97fe5036ef3df2967d086711e6c0c405941e14b.tar.gz -> github.com-kubernetes-kubernetes-c97fe5036ef3df2967d086711e6c0c405941e14b.tar.gz https://github.com/kubernetes/utils/archive/581e00157fb1a0435d4fac54a52d1ca1e481d60e.tar.gz -> github.com-kubernetes-utils-581e00157fb1a0435d4fac54a52d1ca1e481d60e.tar.gz https://github.com/kubernetes-sigs/kustomize/archive/a6f65144121d1955266b0cd836ce954c04122dc8.tar.gz -> github.com-kubernetes-sigs-kustomize-a6f65144121d1955266b0cd836ce954c04122dc8.tar.gz https://github.com/kubernetes-sigs/yaml/archive/fd68e9863619f6ec2fdd8625fe1f02e7c877e480.tar.gz -> github.com-kubernetes-sigs-yaml-fd68e9863619f6ec2fdd8625fe1f02e7c877e480.tar.gz https://github.com/fvbommel/util/archive/efcd4e0f97874370259c7d93e12aad57911dea81.tar.gz -> github.com-fvbommel-util-efcd4e0f97874370259c7d93e12aad57911dea81.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c43f1ab34aeace81f642ef86dee35790
diff --git a/metadata/md5-cache/app-admin/helm-2.16.9 b/metadata/md5-cache/app-admin/helm-2.16.9
deleted file mode 100644
index ce23b7553570..000000000000
--- a/metadata/md5-cache/app-admin/helm-2.16.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.12 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Package Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/helm/archive/v2.16.9.tar.gz -> helm-2.16.9.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/8c41231e01b2085512d98153bcffb847ff9b4b9f.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-8c41231e01b2085512d98153bcffb847ff9b4b9f.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-ansiterm/archive/d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz -> github.com-Azure-go-ansiterm-d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz https://github.com/Azure/go-autorest/archive/69b4126ece6b5257e2f9b0017007d2334153655f.tar.gz -> github.com-Azure-go-autorest-69b4126ece6b5257e2f9b0017007d2334153655f.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/BurntSushi/toml/archive/3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz -> github.com-BurntSushi-toml-3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz https://github.com/chai2010/gettext-go/archive/c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz -> github.com-chai2010-gettext-go-c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz https://github.com/cpuguy83/go-md2man/archive/7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19.tar.gz -> github.com-cpuguy83-go-md2man-7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19.tar.gz https://github.com/cyphar/filepath-securejoin/archive/a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz -> github.com-cyphar-filepath-securejoin-a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz https://github.com/davecgh/go-spew/archive/8991bc29aa16c548c550c7ff78260e27b9ab7c73.tar.gz -> github.com-davecgh-go-spew-8991bc29aa16c548c550c7ff78260e27b9ab7c73.tar.gz https://github.com/dgrijalva/jwt-go/archive/06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz -> github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz https://github.com/docker/distribution/archive/2461543d988979529609e8cb6fca9ca190dc48da.tar.gz -> github.com-docker-distribution-2461543d988979529609e8cb6fca9ca190dc48da.tar.gz https://github.com/docker/docker/archive/be7ac8be2ae072032a4005e8f232be3fc57e4127.tar.gz -> github.com-docker-docker-be7ac8be2ae072032a4005e8f232be3fc57e4127.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/evanphx/json-patch/archive/5858425f75500d40c52783dce87d085a483ce135.tar.gz -> github.com-evanphx-json-patch-5858425f75500d40c52783dce87d085a483ce135.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/color/archive/3f9d52f7176a6927daacff70a3e8d1dc2025c53e.tar.gz -> github.com-fatih-color-3f9d52f7176a6927daacff70a3e8d1dc2025c53e.tar.gz https://github.com/ghodss/yaml/archive/c7ce16629ff4cd059ed96ed06419dd3856fd3577.tar.gz -> github.com-ghodss-yaml-c7ce16629ff4cd059ed96ed06419dd3856fd3577.tar.gz https://github.com/gofrs/flock/archive/392e7fae8f1b0bdbd67dad7237d23f618feb6dbb.tar.gz -> github.com-gofrs-flock-392e7fae8f1b0bdbd67dad7237d23f618feb6dbb.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/65acae22fc9d1fe290b33faa2bd64cdc20a463a0.tar.gz -> github.com-gogo-protobuf-65acae22fc9d1fe290b33faa2bd64cdc20a463a0.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/6c65a5562fc06764971b7c5d05c76c75e84bdbf7.tar.gz -> github.com-golang-protobuf-6c65a5562fc06764971b7c5d05c76c75e84bdbf7.tar.gz https://github.com/google/btree/archive/4030bb1f1f0c35b30ca7009e9ebd06849dd45306.tar.gz -> github.com-google-btree-4030bb1f1f0c35b30ca7009e9ebd06849dd45306.tar.gz https://github.com/google/go-cmp/archive/6f77996f0c42f7b84e5a2b252227263f93432e9b.tar.gz -> github.com-google-go-cmp-6f77996f0c42f7b84e5a2b252227263f93432e9b.tar.gz https://github.com/google/gofuzz/archive/f140a6486e521aad38f5917de355cbf147cc0496.tar.gz -> github.com-google-gofuzz-f140a6486e521aad38f5917de355cbf147cc0496.tar.gz https://github.com/google/uuid/archive/0cd6bf5da1e1c83f8b45653022c74f71af0538a4.tar.gz -> github.com-google-uuid-0cd6bf5da1e1c83f8b45653022c74f71af0538a4.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/c2d73b246b48e239d3f03c455905e06fe26e33c3.tar.gz -> github.com-gophercloud-gophercloud-c2d73b246b48e239d3f03c455905e06fe26e33c3.tar.gz https://github.com/gosuri/uitable/archive/2cf933346b8370a3a3d8867ef5cf54b2129d8ecf.tar.gz -> github.com-gosuri-uitable-2cf933346b8370a3a3d8867ef5cf54b2129d8ecf.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/6af20e3a5340d5e6bde20c8a7a78699efe19ac0a.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-6af20e3a5340d5e6bde20c8a7a78699efe19ac0a.tar.gz https://github.com/hashicorp/golang-lru/archive/7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz -> github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz https://github.com/huandu/xstrings/archive/f02667b379e2fb5916c3cda2cf31e0eb885d79f8.tar.gz -> github.com-huandu-xstrings-f02667b379e2fb5916c3cda2cf31e0eb885d79f8.tar.gz https://github.com/imdario/mergo/archive/9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz -> github.com-imdario-mergo-9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jmoiron/sqlx/archive/d161d7a76b5661016ad0b085869f77fd410f3e6a.tar.gz -> github.com-jmoiron-sqlx-d161d7a76b5661016ad0b085869f77fd410f3e6a.tar.gz https://github.com/json-iterator/go/archive/27518f6661eba504be5a7a9a9f6d9460d892ade3.tar.gz -> github.com-json-iterator-go-27518f6661eba504be5a7a9a9f6d9460d892ade3.tar.gz https://github.com/konsorten/go-windows-terminal-sequences/archive/5c8c8bd35d3832f5d134ae1e1e375b69a4d25242.tar.gz -> github.com-konsorten-go-windows-terminal-sequences-5c8c8bd35d3832f5d134ae1e1e375b69a4d25242.tar.gz https://github.com/lib/pq/archive/f91d3411e481ed313eeab65ebfe9076466c39d01.tar.gz -> github.com-lib-pq-f91d3411e481ed313eeab65ebfe9076466c39d01.tar.gz https://github.com/liggitt/tabwriter/archive/89fcab3d43de07060e4fd4c1547430ed57e87f24.tar.gz -> github.com-liggitt-tabwriter-89fcab3d43de07060e4fd4c1547430ed57e87f24.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/goutils/archive/41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0.tar.gz -> github.com-Masterminds-goutils-41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0.tar.gz https://github.com/Masterminds/semver/archive/805c489aa98f412e79eb308a37996bf9d8b1c91e.tar.gz -> github.com-Masterminds-semver-805c489aa98f412e79eb308a37996bf9d8b1c91e.tar.gz https://github.com/Masterminds/sprig/archive/e4c0945838d570720d876a6ad9b4568ed32317b4.tar.gz -> github.com-Masterminds-sprig-e4c0945838d570720d876a6ad9b4568ed32317b4.tar.gz https://github.com/Masterminds/vcs/archive/f94282d8632a0620f79f0c6ff0e82604e8c5c85b.tar.gz -> github.com-Masterminds-vcs-f94282d8632a0620f79f0c6ff0e82604e8c5c85b.tar.gz https://github.com/mattn/go-colorable/archive/98ec13f34aabf44cc914c65a1cfb7b9bc815aef1.tar.gz -> github.com-mattn-go-colorable-98ec13f34aabf44cc914c65a1cfb7b9bc815aef1.tar.gz https://github.com/mattn/go-isatty/archive/0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a.tar.gz -> github.com-mattn-go-isatty-0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a.tar.gz https://github.com/mattn/go-runewidth/archive/9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf.tar.gz -> github.com-mattn-go-runewidth-9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/mitchellh/copystructure/archive/9a1b6f44e8da0e0e374624fb0a825a231b00c537.tar.gz -> github.com-mitchellh-copystructure-9a1b6f44e8da0e0e374624fb0a825a231b00c537.tar.gz https://github.com/mitchellh/go-wordwrap/archive/9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c.tar.gz -> github.com-mitchellh-go-wordwrap-9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c.tar.gz https://github.com/mitchellh/reflectwalk/archive/3e2c75dfad4fbf904b58782a80fd595c760ad185.tar.gz -> github.com-mitchellh-reflectwalk-3e2c75dfad4fbf904b58782a80fd595c760ad185.tar.gz https://github.com/modern-go/concurrent/archive/bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz -> github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz https://github.com/modern-go/reflect2/archive/94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz -> github.com-modern-go-reflect2-94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz https://github.com/opencontainers/go-digest/archive/279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz -> github.com-opencontainers-go-digest-279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/pkg/errors/archive/27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7.tar.gz -> github.com-pkg-errors-27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7.tar.gz https://github.com/prometheus/client_golang/archive/505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz -> github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz https://github.com/prometheus/client_model/archive/5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz -> github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz https://github.com/prometheus/common/archive/4724e9255275ce38f7179b2478abeae4e28c904f.tar.gz -> github.com-prometheus-common-4724e9255275ce38f7179b2478abeae4e28c904f.tar.gz https://github.com/prometheus/procfs/archive/1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz -> github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/rubenv/sql-migrate/archive/9355dd04f4b3dc9ed604623307307a3491a627bc.tar.gz -> github.com-rubenv-sql-migrate-9355dd04f4b3dc9ed604623307307a3491a627bc.tar.gz https://github.com/russross/blackfriday/archive/05f3235734ad95d0016f6a23902f06461fcf567a.tar.gz -> github.com-russross-blackfriday-05f3235734ad95d0016f6a23902f06461fcf567a.tar.gz https://github.com/sirupsen/logrus/archive/839c75faf7f98a33d445d181f3018b5c3409a45e.tar.gz -> github.com-sirupsen-logrus-839c75faf7f98a33d445d181f3018b5c3409a45e.tar.gz https://github.com/spf13/cobra/archive/f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5.tar.gz -> github.com-spf13-cobra-f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5.tar.gz https://github.com/spf13/pflag/archive/2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab.tar.gz -> github.com-spf13-pflag-2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab.tar.gz https://github.com/technosophos/moniker/archive/a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz -> github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz https://github.com/golang/crypto/archive/e84da0312774c21d64ee2317962ef669b27ffb41.tar.gz -> github.com-golang-crypto-e84da0312774c21d64ee2317962ef669b27ffb41.tar.gz https://github.com/golang/net/archive/cdfb69ac37fc6fa907650654115ebebb3aae2087.tar.gz -> github.com-golang-net-cdfb69ac37fc6fa907650654115ebebb3aae2087.tar.gz https://github.com/golang/oauth2/archive/9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz -> github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz https://github.com/golang/sync/archive/42b317875d0fa942474b76e1b46a6060d720ae6e.tar.gz -> github.com-golang-sync-42b317875d0fa942474b76e1b46a6060d720ae6e.tar.gz https://github.com/golang/sys/archive/b90733256f2e882e81d52f9126de08df5615afd9.tar.gz -> github.com-golang-sys-b90733256f2e882e81d52f9126de08df5615afd9.tar.gz https://github.com/golang/text/archive/e6919f6577db79269a6443b9dc46d18f2238fb5d.tar.gz -> github.com-golang-text-e6919f6577db79269a6443b9dc46d18f2238fb5d.tar.gz https://github.com/golang/time/archive/f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz -> github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz https://github.com/golang/appengine/archive/54a98f90d1c46b7731eb8fb305d2a321c30ef610.tar.gz -> github.com-golang-appengine-54a98f90d1c46b7731eb8fb305d2a321c30ef610.tar.gz https://github.com/google/go-genproto/archive/919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0.tar.gz -> github.com-google-go-genproto-919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0.tar.gz https://github.com/grpc/grpc-go/archive/a02b0774206b209466313a0b525d2c738fe407eb.tar.gz -> github.com-grpc-grpc-go-a02b0774206b209466313a0b525d2c738fe407eb.tar.gz https://github.com/go-gorp/gorp/archive/6a667da9c028871f98598d85413e3fc4c6daa52e.tar.gz -> github.com-go-gorp-gorp-6a667da9c028871f98598d85413e3fc4c6daa52e.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/square/go-jose/archive/e94fb177d3668d35ab39c61cbb2f311550557e83.tar.gz -> github.com-square-go-jose-e94fb177d3668d35ab39c61cbb2f311550557e83.tar.gz https://github.com/go-yaml/yaml/archive/f221b8435cfb71e54062f6c6e99e9ade30b124d5.tar.gz -> github.com-go-yaml-yaml-f221b8435cfb71e54062f6c6e99e9ade30b124d5.tar.gz https://github.com/kubernetes/api/archive/35e52d86657aba06859dd22099bfa14faf1effb2.tar.gz -> github.com-kubernetes-api-35e52d86657aba06859dd22099bfa14faf1effb2.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/5357c4baaf6562e4d37c9afc9fef99bd16d76a9f.tar.gz -> github.com-kubernetes-apiextensions-apiserver-5357c4baaf6562e4d37c9afc9fef99bd16d76a9f.tar.gz https://github.com/kubernetes/apimachinery/archive/a2eda9f80ab8a454a81bdde16d62a1afe5f931c0.tar.gz -> github.com-kubernetes-apimachinery-a2eda9f80ab8a454a81bdde16d62a1afe5f931c0.tar.gz https://github.com/kubernetes/apiserver/archive/5190913f932d82e562d4eb91d0f3d7a063bdbc07.tar.gz -> github.com-kubernetes-apiserver-5190913f932d82e562d4eb91d0f3d7a063bdbc07.tar.gz https://github.com/kubernetes/client-go/archive/bec269661e48cb1e5fbb0d037f356ffe9e9978a0.tar.gz -> github.com-kubernetes-client-go-bec269661e48cb1e5fbb0d037f356ffe9e9978a0.tar.gz https://github.com/kubernetes/cli-runtime/archive/74ad18325ed51ea6de9ee19bae59156bad18ecd2.tar.gz -> github.com-kubernetes-cli-runtime-74ad18325ed51ea6de9ee19bae59156bad18ecd2.tar.gz https://github.com/kubernetes/component-base/archive/039242c015a9f5eeaccea3ea17c6973b9c27166a.tar.gz -> github.com-kubernetes-component-base-039242c015a9f5eeaccea3ea17c6973b9c27166a.tar.gz https://github.com/kubernetes/klog/archive/3ca30a56d8a775276f9cdae009ba326fdc05af7f.tar.gz -> github.com-kubernetes-klog-3ca30a56d8a775276f9cdae009ba326fdc05af7f.tar.gz https://github.com/kubernetes/kube-openapi/archive/743ec37842bffe49dd4221d9026f30fb1d5adbc4.tar.gz -> github.com-kubernetes-kube-openapi-743ec37842bffe49dd4221d9026f30fb1d5adbc4.tar.gz https://github.com/kubernetes/kubectl/archive/2ed914427d51f6fd865e0db43d72b2f22610cf32.tar.gz -> github.com-kubernetes-kubectl-2ed914427d51f6fd865e0db43d72b2f22610cf32.tar.gz https://github.com/kubernetes/kubernetes/archive/c97fe5036ef3df2967d086711e6c0c405941e14b.tar.gz -> github.com-kubernetes-kubernetes-c97fe5036ef3df2967d086711e6c0c405941e14b.tar.gz https://github.com/kubernetes/utils/archive/581e00157fb1a0435d4fac54a52d1ca1e481d60e.tar.gz -> github.com-kubernetes-utils-581e00157fb1a0435d4fac54a52d1ca1e481d60e.tar.gz https://github.com/kubernetes-sigs/kustomize/archive/a6f65144121d1955266b0cd836ce954c04122dc8.tar.gz -> github.com-kubernetes-sigs-kustomize-a6f65144121d1955266b0cd836ce954c04122dc8.tar.gz https://github.com/kubernetes-sigs/yaml/archive/fd68e9863619f6ec2fdd8625fe1f02e7c877e480.tar.gz -> github.com-kubernetes-sigs-yaml-fd68e9863619f6ec2fdd8625fe1f02e7c877e480.tar.gz https://github.com/fvbommel/util/archive/efcd4e0f97874370259c7d93e12aad57911dea81.tar.gz -> github.com-fvbommel-util-efcd4e0f97874370259c7d93e12aad57911dea81.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=33f7e1f77f4ab794a41037b9c9c6fc86
diff --git a/metadata/md5-cache/app-admin/helm-3.4.1 b/metadata/md5-cache/app-admin/helm-3.4.1
new file mode 100644
index 000000000000..5772573ac51b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/helm-3.4.1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=Kubernetes Package Manager
+EAPI=7
+HOMEPAGE=https://github.com/helm/helm https://helm.sh
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/helm/helm/archive/v3.4.1.tar.gz -> helm-3.4.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.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.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/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/v13.3.2+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv13.3.2+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v13.3.2+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv13.3.2+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.zip 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.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.zip 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.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.zip 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.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.zip 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/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/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.4.1.zip -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.4.1.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.4.1.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/!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/!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.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/v3/@v/v3.1.0.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.zip 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/sprig/v3/@v/v3.1.0.zip -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.zip 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/squirrel/@v/v1.4.0.zip -> github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/!masterminds/squirrel/@v/v1.4.0.mod -> github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.4.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.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/@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.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.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/!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/!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/!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/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.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/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/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/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/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.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.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-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.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.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-v2/@v/v0.18.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.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.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.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/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/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/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.zip -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.zip 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/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/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.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.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.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.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/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/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/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.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.2.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.zip 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.4.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.4.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.4.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.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-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.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.zip 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.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/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.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.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.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-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.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-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/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/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/deislabs/oras/@v/v0.8.1.zip -> github.com%2Fdeislabs%2Foras%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/deislabs/oras/@v/v0.8.1.mod -> github.com%2Fdeislabs%2Foras%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20191001013358-cfbb681360f0.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20191001013358-cfbb681360f0.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.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200130152716-5d0cf8839492.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200130152716-5d0cf8839492.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200130152716-5d0cf8839492.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200130152716-5d0cf8839492.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20191216044856-a8371794149d.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20191216044856-a8371794149d.zip mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20191216044856-a8371794149d.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20191216044856-a8371794149d.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.4.2-0.20200203170920-46ec8731fbce.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200203170920-46ec8731fbce.zip mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200203170920-46ec8731fbce.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200203170920-46ec8731fbce.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-metrics/@v/v0.0.0-20180209012529-399ea8c73916.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.zip 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-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.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.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.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/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.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.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/evanphx/json-patch/@v/v0.0.0-20200808040245-162e5629780b.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20200808040245-162e5629780b.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v0.0.0-20200808040245-162e5629780b.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20200808040245-162e5629780b.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.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/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.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.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.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/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-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.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/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.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.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.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.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.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.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.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.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.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/envy/@v/v1.7.1.zip -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/gobuffalo/envy/@v/v1.7.1.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v1.0.1.zip -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/gobuffalo/logger/@v/v1.0.1.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.3.0.zip -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/gobuffalo/packd/@v/v0.3.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.7.1.zip -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.7.1.zip mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.7.1.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.7.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-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godror/godror/@v/v0.13.3.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.13.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/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.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/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-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.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.zip 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.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.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.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.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/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.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-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.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/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/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.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/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/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.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/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.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.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.zip -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.zip 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.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.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/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/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/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-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.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.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/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-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.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/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.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.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/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.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/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/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-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/jmoiron/sqlx/@v/v1.2.0.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.0.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.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/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.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/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.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/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/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.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/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/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.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.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.7.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.7.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.7.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/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/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.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/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/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.0.7.mod -> github.com%2Fmattn%2Fgo-oci8%2F@v%2Fv0.0.7.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.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 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.10.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.10.zip 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-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.12.0.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.12.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.12.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/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/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/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/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.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip 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/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/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.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/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.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.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.1.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.2.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.2.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.10.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip 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.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/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-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.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/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.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.zip 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/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.zip 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-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/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.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/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-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/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/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-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/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-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.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.3.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.zip 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.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-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.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.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-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.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.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.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/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-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.5.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.zip 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.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/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/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/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.3.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.4.0.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.4.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/rubenv/sql-migrate/@v/v0.0.0-20200616145509-8d140a17f351.zip -> github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200616145509-8d140a17f351.zip mirror://goproxy//github.com/rubenv/sql-migrate/@v/v0.0.0-20200616145509-8d140a17f351.mod -> github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200616145509-8d140a17f351.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/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/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/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.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/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.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/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.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/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.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/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/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/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.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.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.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/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/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/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/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.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/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.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/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/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/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.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.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.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.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.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/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/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//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-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-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-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-20190621222207-cc06ce4a13d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190621222207-cc06ce4a13d4.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-20200128174031-69ecbb4d6d5d.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.zip 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-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-20200414173820-0848c9571904.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.zip 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.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/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.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.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/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.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-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-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-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.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-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-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-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.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 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/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/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.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/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-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-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-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-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-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-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.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.zip 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-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.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.zip 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-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.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.zip 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/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.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.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-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-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-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-20191004055002-72853e10c5a3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191004055002-72853e10c5a3.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-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-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-20200616133436-c1934b75d054.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200616133436-c1934b75d054.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//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.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.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/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/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-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.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-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.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.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/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.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//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.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.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/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/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/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/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.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//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//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//k8s.io/api/@v/v0.18.4.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.4.zip mirror://goproxy//k8s.io/api/@v/v0.18.4.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.4.mod mirror://goproxy//k8s.io/api/@v/v0.18.8.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.8.zip mirror://goproxy//k8s.io/api/@v/v0.18.8.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.8.mod mirror://goproxy//k8s.io/api/@v/v0.19.2.zip -> k8s.io%2Fapi%2F@v%2Fv0.19.2.zip mirror://goproxy//k8s.io/api/@v/v0.19.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.19.2.mod mirror://goproxy//k8s.io/api/@v/v0.19.3.zip -> k8s.io%2Fapi%2F@v%2Fv0.19.3.zip mirror://goproxy//k8s.io/api/@v/v0.19.3.mod -> k8s.io%2Fapi%2F@v%2Fv0.19.3.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.19.3.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.3.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.19.3.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.19.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.19.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.3.mod mirror://goproxy//k8s.io/apiserver/@v/v0.19.3.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.19.3.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.19.3.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.19.3.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.19.3.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.19.3.mod mirror://goproxy//k8s.io/client-go/@v/v0.19.3.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.19.3.zip mirror://goproxy//k8s.io/client-go/@v/v0.19.3.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.19.3.mod mirror://goproxy//k8s.io/code-generator/@v/v0.19.3.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.19.3.mod mirror://goproxy//k8s.io/component-base/@v/v0.19.3.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.3.zip mirror://goproxy//k8s.io/component-base/@v/v0.19.3.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.3.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/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-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/kubectl/@v/v0.19.3.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.19.3.zip mirror://goproxy//k8s.io/kubectl/@v/v0.19.3.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.19.3.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.19.3.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.19.3.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.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.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/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 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//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.mod -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6cea39d71f246e53d5cf588d1ed24537
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 7d895036c75d..64693844f36a 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/siege-4.0.7 b/metadata/md5-cache/app-benchmarks/siege-4.0.7
index b84bd2c35515..c391cc284e86 100644
--- a/metadata/md5-cache/app-benchmarks/siege-4.0.7
+++ b/metadata/md5-cache/app-benchmarks/siege-4.0.7
@@ -5,10 +5,10 @@ DESCRIPTION=A HTTP regression testing and benchmarking utility
 EAPI=7
 HOMEPAGE=https://www.joedog.org/siege-home https://github.com/JoeDog/siege
 IUSE=libressl ssl
-KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://download.joedog.org/siege/siege-4.0.7.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=26574a07ebcf36c956ba0ccfd3ffc460
+_md5_=ef862e56e17876b1c7b1e34f8c5b6415
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 79ed22e6b6b1..d2b1b3aeb21c 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/halibut-1.2 b/metadata/md5-cache/app-doc/halibut-1.2
index bafb85438264..29c01d0024bb 100644
--- a/metadata/md5-cache/app-doc/halibut-1.2
+++ b/metadata/md5-cache/app-doc/halibut-1.2
@@ -7,4 +7,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-1.2/halibut-1.2.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5b3e62e349655b0062635edf21677194
+_md5_=060a3cc37414c6ba5e8a5ebda5251f9a
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 2cd600a75000..27644cce9adc 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r20 b/metadata/md5-cache/app-editors/emacs-23.4-r20
index bd6a3397652c..c865bef94d69 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r20
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r20
@@ -11,4 +11,4 @@ RDEPEND=acct-group/mail app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/l
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=015dc2a0c89a43357876d305e2447a79
+_md5_=9b940f3bdf07ea3d711f23c7edf70612
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r9 b/metadata/md5-cache/app-editors/emacs-24.5-r9
index f8e796117163..93605be666ab 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r9
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r9
@@ -11,4 +11,4 @@ RDEPEND=acct-group/mail app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/l
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ac81ae96db0429389d58dd97bf3c467b
+_md5_=4a77fa71062c8d944fd7f4430d9d3b21
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r8 b/metadata/md5-cache/app-editors/emacs-25.3-r8
index 590daaeeed8e..4ee79e605b25 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r8
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r8
@@ -11,4 +11,4 @@ RDEPEND=acct-group/mail app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/l
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-2.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ec30748e8d0d32c96ad6e9edfa4202b8
+_md5_=de47877695fe34a84ee298128581b3df
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r3 b/metadata/md5-cache/app-editors/emacs-26.3-r3
index e5eb2bb5da92..8d05433e0f73 100644
--- a/metadata/md5-cache/app-editors/emacs-26.3-r3
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r3
@@ -11,4 +11,4 @@ RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? (
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fe972ca794b70fc89f09ab17f994ddbe
+_md5_=c61354923183506a134f51a3785aee89
diff --git a/metadata/md5-cache/app-editors/emacs-27.1-r2 b/metadata/md5-cache/app-editors/emacs-27.1-r2
index 4240cbe45ee5..7c2b78a91c6d 100644
--- a/metadata/md5-cache/app-editors/emacs-27.1-r2
+++ b/metadata/md5-cache/app-editors/emacs-27.1-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=27
 SRC_URI=mirror://gnu/emacs/emacs-27.1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba2e8f96c53ce8a311ef2d4565c29c95
+_md5_=eba9fd7b73039519faa4edd006f967b7
diff --git a/metadata/md5-cache/app-editors/emacs-27.1-r3 b/metadata/md5-cache/app-editors/emacs-27.1-r3
new file mode 100644
index 000000000000..2ccd6cf97453
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-27.1-r3
@@ -0,0 +1,15 @@
+BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<=app-editors/emacs-27.1.9999-r0:27-vcs !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
+RESTRICT=test
+SLOT=27
+SRC_URI=mirror://gnu/emacs/emacs-27.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=65698c6bde4d1286088b86e1e5ec280d
diff --git a/metadata/md5-cache/app-editors/emacs-27.1.9999-r1 b/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
index 79a83dc30121..ba1c6cf1fef6 100644
--- a/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
@@ -1,5 +1,5 @@
 BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=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 unpack
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
 DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? (
 RESTRICT=test
 SLOT=27-vcs
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=217f3829296b004ead5b94176c9ed1e4
+_md5_=3f0ccbcecd6b660967e3165c168ba868
diff --git a/metadata/md5-cache/app-editors/emacs-28.0.9999 b/metadata/md5-cache/app-editors/emacs-28.0.9999
index 2f3e94ed0ebf..d3bd03880425 100644
--- a/metadata/md5-cache/app-editors/emacs-28.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.0.9999
@@ -1,5 +1,5 @@
 BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=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 unpack
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
 DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? (
 RESTRICT=test
 SLOT=28-vcs
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=569ed092dcd8fb6c124719442c7c7aef
+_md5_=b3ea0ba8e7215b7c86249833c7ef6939
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index bc21c48dac90..4858f9f0d24b 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/kompose-1.16.0 b/metadata/md5-cache/app-emulation/kompose-1.16.0
deleted file mode 100644
index c6416aae0cf3..000000000000
--- a/metadata/md5-cache/app-emulation/kompose-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Tool to move from docker-compose to Kubernetes
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kompose/archive/v1.16.0.tar.gz -> kompose-1.16.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=3fbd16bf1c3cddbda8201facdec99915
diff --git a/metadata/md5-cache/app-emulation/kompose-1.19.0 b/metadata/md5-cache/app-emulation/kompose-1.19.0
deleted file mode 100644
index bff536417e84..000000000000
--- a/metadata/md5-cache/app-emulation/kompose-1.19.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Tool to move from docker-compose to Kubernetes
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kompose/archive/v1.19.0.tar.gz -> kompose-1.19.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=5dab05a63f2a2517df40ae2216e5e007
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index bcb9e95be8cd..425ae90ace23 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.8 b/metadata/md5-cache/app-i18n/uim-1.8.8
index 12545962db44..2739badc5c99 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.8
+++ b/metadata/md5-cache/app-i18n/uim-1.8.8
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/releases/download/1.8.8/uim-1.8.8.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79dff87db0d0199bb6f2405b2dc27836
+_md5_=1e657c91c8ec49fa0e6f9beff72277a6
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index bfdfc89d7d69..51424807d927 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/rox-filer-2.11 b/metadata/md5-cache/app-misc/rox-filer-2.11
index d201c704215b..f960f4a964a9 100644
--- a/metadata/md5-cache/app-misc/rox-filer-2.11
+++ b/metadata/md5-cache/app-misc/rox-filer-2.11
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl dev-libs/libxml2:2 gnome-base/libglade:2.0 x11-libs/gtk+:2 dev-util/intltool sys-devel/gettext virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEPEND=dev-lang/perl dev-libs/libxml2:2 gnome-base/libglade:2.0 x11-libs/gtk+:2 dev-util/intltool sys-devel/gettext
 DESCRIPTION=ROX-Filer a drag and drop spatial file manager
-EAPI=5
-HOMEPAGE=http://rox.sourceforge.net/desktop
+EAPI=7
+HOMEPAGE=http://rox.sourceforge.net/desktop/ROX-Filer.html
 IUSE=test
 KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2
+LICENSE=GPL-2+ LGPL-2+
 RDEPEND=dev-lang/perl dev-libs/libxml2:2 gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-misc/shared-mime-info
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://sourceforge/rox/rox-filer-2.11.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=43f7e136e349be3edd8c36126028b98e
+SRC_URI=https://download.sourceforge.net/rox/rox-filer-2.11.tar.bz2
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_md5_=967d24c4fa990a4db8d0f795dcb1cb4f
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 81bb83639a4f..2580ee71584b 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/libreoffice-7.0.3.1 b/metadata/md5-cache/app-office/libreoffice-7.0.3.1
index 98f62e21d41d..ee656f209ffa 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.0.3.1
+++ b/metadata/md5-cache/app-office/libreoffice-7.0.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.0.3.1.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.0.3.1.tar.xz https://download.documentfoundation.org/libreoffice/src/7.0.3//libreoffice-7.0.3.1.tar.xz https://download.documentfoundation.org/libreoffice/src/7.0.3//libreoffice-help-7.0.3.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.0.3.1/src/libreoffice-7.0.3.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.0.3.1/src/libreoffice-help-7.0.3.1.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e537955f025ef94201e2abda0daba354
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b12e7660182af38c0f322092ba0a9f21
diff --git a/metadata/md5-cache/app-office/libreoffice-7.0.9999 b/metadata/md5-cache/app-office/libreoffice-7.0.9999
index f4c2b7745674..4f87a3eb9101 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-7.0.9999
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1e1b672fc6e2f5b6ab016d156f23bf9
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26e1088fc1757792f92fabed3d59a507
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 7ca646b20961..bf6f9b5fdbc7 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85b33d61446c024ae6d743d44af295f0
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=32f80d6fd88f7f72789cba04b5f1fab4
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index ae91463017f4..f2c111d16ca2 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/nattka-0.2.11 b/metadata/md5-cache/app-portage/nattka-0.2.11
index d14296b2e166..6840e6400cf4 100644
--- a/metadata/md5-cache/app-portage/nattka-0.2.11
+++ b/metadata/md5-cache/app-portage/nattka-0.2.11
@@ -4,7 +4,7 @@ DESCRIPTION=A New Arch Tester Toolkit -- open-source stable-bot replacement
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/nattka/
 IUSE=depgraph-order doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-util/pkgcheck[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git sys-apps/pkgcore[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] depgraph-order? ( dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/nattka/archive/v0.2.11.tar.gz -> nattka-0.2.11.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6a7c90ba82594702edadf84e777621e8
+_md5_=939ddff4be7603c95a9f452bb8a0b67c
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 43ec8f49ef67..37183624f281 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/ansifilter-2.17 b/metadata/md5-cache/app-text/ansifilter-2.17
index a63fbc5265dc..3169f4738498 100644
--- a/metadata/md5-cache/app-text/ansifilter-2.17
+++ b/metadata/md5-cache/app-text/ansifilter-2.17
@@ -4,10 +4,10 @@ DESCRIPTION=Handles text files containing ANSI terminal escape codes
 EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=qt5
-KEYWORDS=amd64 arm arm64 ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.17.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=690ad177b519f4ca68eea2cf436c4c1f
+_md5_=512e24f78d0ea0922ffbbded5fe7271e
diff --git a/metadata/md5-cache/app-text/calibre-4.22.0 b/metadata/md5-cache/app-text/calibre-4.22.0
index 302297894ad1..a1cfd4094af2 100644
--- a/metadata/md5-cache/app-text/calibre-4.22.0
+++ b/metadata/md5-cache/app-text/calibre-4.22.0
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 SLOT=0
 SRC_URI=https://download.calibre-ebook.com/4.22.0/calibre-4.22.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32513062797ef33e84f6e554f8971486
+_md5_=02339f711ea37eb4b70e24b81d9c4d24
diff --git a/metadata/md5-cache/app-text/calibre-4.23.0 b/metadata/md5-cache/app-text/calibre-4.23.0
index 567789c34189..da85462a3007 100644
--- a/metadata/md5-cache/app-text/calibre-4.23.0
+++ b/metadata/md5-cache/app-text/calibre-4.23.0
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 SLOT=0
 SRC_URI=https://download.calibre-ebook.com/4.23.0/calibre-4.23.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0439d33f86f1044d6fcc01d863ff4fa6
+_md5_=813f4f6a471d20fa19ff7320d4d7eedf
diff --git a/metadata/md5-cache/app-text/calibre-5.4.2 b/metadata/md5-cache/app-text/calibre-5.4.2
index f4899338dac7..5c566692a230 100644
--- a/metadata/md5-cache/app-text/calibre-5.4.2
+++ b/metadata/md5-cache/app-text/calibre-5.4.2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 SLOT=0
 SRC_URI=https://download.calibre-ebook.com/5.4.2/calibre-5.4.2.tar.xz https://dev.gentoo.org/~zmedico/dist/calibre-5.4.2-SIP-v4.patch.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ef7b3ecbca53e6364038f6aec95b86c
+_md5_=b54c6b21f128a113a5fc9dc689d7ffec
diff --git a/metadata/md5-cache/app-text/docbook2X-0.8.8-r4 b/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
index 9fb9e0faa6b5..b51e5f7be15e 100644
--- a/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
+++ b/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Tools to convert docbook to man and info
 EAPI=5
 HOMEPAGE=http://docbook2x.sourceforge.net/
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML-SAX dev-perl/XML-LibXML app-text/docbook-xsl-stylesheets =app-text/docbook-xml-dtd-4.2*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook2x/docbook2X-0.8.8.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e3580882df15e4b7f6e4b069596dbf0
+_md5_=641cb52410c30af9b6881b4ab03937fa
diff --git a/metadata/md5-cache/app-text/wgetpaste-2.29-r1 b/metadata/md5-cache/app-text/wgetpaste-2.29-r1
index 087075f55ee6..03ac3045ae75 100644
--- a/metadata/md5-cache/app-text/wgetpaste-2.29-r1
+++ b/metadata/md5-cache/app-text/wgetpaste-2.29-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Command-line interface to various pastebins
 EAPI=7
 HOMEPAGE=http://wgetpaste.zlin.dk/
 IUSE=+ssl
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=public-domain
 RDEPEND=net-misc/wget[ssl?]
 SLOT=0
 SRC_URI=http://wgetpaste.zlin.dk/wgetpaste-2.29.tar.bz2
-_md5_=747e84e79137b6d8a1385baedeafa4a0
+_md5_=28b7b298c91362a3610f6e3299043e41
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 135c7d843ecf..6ab3ca7372f1 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1 b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
index 1bb4e2a377d6..84d672b0a515 100644
--- a/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
+++ b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax highlighting for perl module Template-Toolkit
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=830
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~x64-macos
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/tt2-syntax-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tt2-syntax-1.13.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b70ba6792e3df8659081d34bbf9ce1c0
+_md5_=7ac2de5b898fb0f5d57d31afe313e9ec
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 9971d14ae737..00ab47c6df9c 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.10 b/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.10
new file mode 100644
index 000000000000..4fd97030d088
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.10
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker
+EAPI=7
+HOMEPAGE=https://github.com/CopernicaMarketingSoftware/AMQP-CPP
+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 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/v4.3.10.tar.gz -> AMQP-CPP-4.3.10.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=389db2c1e5045e34a7d1c7c4597e4a78
diff --git a/metadata/md5-cache/dev-cpp/tclap-1.2.2 b/metadata/md5-cache/dev-cpp/tclap-1.2.2
index 07eb0a6ff65a..ca233b0c56f1 100644
--- a/metadata/md5-cache/dev-cpp/tclap-1.2.2
+++ b/metadata/md5-cache/dev-cpp/tclap-1.2.2
@@ -4,8 +4,8 @@ DESCRIPTION=Simple templatized C++ library for parsing command line arguments
 EAPI=7
 HOMEPAGE=http://tclap.sourceforge.net
 IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/tclap/tclap-1.2.2.tar.gz
-_md5_=d9b5b8f275c61af4b0bea327c273839b
+_md5_=d85700b8cca51bfea96eaea2ffdbba61
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index bc4974f4d0f0..1a47db644d36 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/libzdb-3.1 b/metadata/md5-cache/dev-db/libzdb-3.1
deleted file mode 100644
index ed48326890f0..000000000000
--- a/metadata/md5-cache/dev-db/libzdb-3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=A thread safe high level multi-database connection pool library
-EAPI=5
-HOMEPAGE=http://www.tildeslash.com/libzdb/
-IUSE=debug doc mysql postgres +sqlite ssl static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=|| ( postgres mysql sqlite )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.tildeslash.com/libzdb/dist/libzdb-3.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2fa78168add097ee39e654a982c7b585
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.36 b/metadata/md5-cache/dev-db/mariadb-10.2.36
index d38b0d844f86..dddd8896e736 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.36
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.36
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.2/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.36/source/mariadb-10.2.36.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.2.36-patches-01.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d48b3ca3c1143f385658fa64816618e
+_md5_=40424f4e8c67633d3799519b0176d9f0
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.27 b/metadata/md5-cache/dev-db/mariadb-10.3.27
index 18d7a2c6f00f..3566dc82502f 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.27
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.27
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.3/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.27/source/mariadb-10.3.27.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.3.27-patches-01.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57fe193ff6a1d68f9826c29c20c3f4ef
+_md5_=a714c33e7c0a505959e22567e3bd8476
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.17 b/metadata/md5-cache/dev-db/mariadb-10.4.17
index f6a0eceb1cce..9a49e2ff9317 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.17
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.17
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.5 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.4/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.17/source/mariadb-10.4.17.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.17-patches-01.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e17eeb3f7a1a5d2404c45df1cc4d8d4
+_md5_=36c76200b36713a9d5c7a336009554e0
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 5b3c0f6aaf33..15b73cd8795d 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/esptool-3.0 b/metadata/md5-cache/dev-embedded/esptool-3.0
new file mode 100644
index 000000000000..a8dff7d00a0a
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/esptool-3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) 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
+DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
+EAPI=7
+HOMEPAGE=https://github.com/espressif/esptool
+IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-python/bitstring[python_targets_python3_6(-)] dev-python/cryptography[python_targets_python3_6(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_6(-)] dev-python/pyserial[python_targets_python3_6(-)] dev-python/reedsolomon[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/bitstring[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_7(-)] dev-python/pyserial[python_targets_python3_7(-)] dev-python/reedsolomon[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/bitstring[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_8(-)] dev-python/pyserial[python_targets_python3_8(-)] dev-python/reedsolomon[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/bitstring[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_9(-)] dev-python/pyserial[python_targets_python3_9(-)] dev-python/reedsolomon[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/espressif/esptool/archive/v3.0.tar.gz -> esptool-3.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=51988cbc7ffb566978519094f99ada36
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 7b4d07ca30ab..4f9462ba1632 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1 b/metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1
deleted file mode 100644
index 0a6a6560b654..000000000000
--- a/metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=An XHTML combinator library
-EAPI=7
-HOMEPAGE=https://github.com/haskell/xhtml
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10.4:=
-SLOT=0/3000.2.1
-SRC_URI=https://hackage.haskell.org/package/xhtml-3000.2.1/xhtml-3000.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=197c2db6b651e201a2531f9ba59864d6
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index fa6fbb7f8785..245af4c4156f 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.17.0 b/metadata/md5-cache/dev-lang/jsonnet-0.17.0
deleted file mode 100644
index f2fd995107af..000000000000
--- a/metadata/md5-cache/dev-lang/jsonnet-0.17.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=A data templating language for app and tool developers
-EAPI=7
-HOMEPAGE=https://jsonnet.org/
-IUSE=custom-optimization python test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/jsonnet/archive/v0.17.0.tar.gz -> jsonnet-0.17.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=466970b904c2a3130ed102033429193c
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1 b/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
new file mode 100644
index 000000000000..3abb5c193aec
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=A data templating language for app and tool developers
+EAPI=7
+HOMEPAGE=https://jsonnet.org/
+IUSE=custom-optimization doc examples python test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/jsonnet/archive/v0.17.0.tar.gz -> jsonnet-0.17.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=60e1de49931f32592c9d5c31a3af9de2
diff --git a/metadata/md5-cache/dev-lang/srf-1.0-r2 b/metadata/md5-cache/dev-lang/srf-1.0-r2
index d8424fce1a47..0a2261e2ed4b 100644
--- a/metadata/md5-cache/dev-lang/srf-1.0-r2
+++ b/metadata/md5-cache/dev-lang/srf-1.0-r2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.stratigery.com/srf.html/srf-1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=557c14ecf4c405d84e27ca6284a4a6c6
+_eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5295820bebf61e77f96e27bcd808cd80
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4b398f8c775b..eaaf117da5b2 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/icu-68.1 b/metadata/md5-cache/dev-libs/icu-68.1
index b8c69ee7f5ab..a19f97492d58 100644
--- a/metadata/md5-cache/dev-libs/icu-68.1
+++ b/metadata/md5-cache/dev-libs/icu-68.1
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0/68.1
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-68-1/icu4c-68_1-src.tgz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2788b5dd6d638d891262c1635524f981
+_md5_=f638a3cb785f08ed0a57e358d83ef070
diff --git a/metadata/md5-cache/dev-libs/jansson-2.13.1 b/metadata/md5-cache/dev-libs/jansson-2.13.1
index 88be02fb155e..0487afb6834a 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.13.1
+++ b/metadata/md5-cache/dev-libs/jansson-2.13.1
@@ -4,9 +4,9 @@ DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=7
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.digip.org/jansson/releases/jansson-2.13.1.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a9e5993811042f2494f6264785e9eef0
+_md5_=ae51bdf3fc634791f60db079ffadd61d
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
index e79abe6c88f6..a85611aa2333 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=C++ JSON reader and writer
 EAPI=7
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 IUSE=doc 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 ~x64-macos
 LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.4.tar.gz -> jsoncpp-1.9.4.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=15461de5ad49f90d25f9d687b344546b
+_md5_=cc90f78951e1a8aac5f678b38b9c3b6d
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.2 b/metadata/md5-cache/dev-libs/leatherman-1.12.2
index 3505e6113c63..2212221d8056 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.2
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.2
@@ -5,11 +5,11 @@ DESCRIPTION=A C++ toolkit
 EAPI=7
 HOMEPAGE=https://github.com/puppetlabs/leatherman
 IUSE=debug static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=net-misc/curl
 RESTRICT=test
 SLOT=0/1.12.2
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.2.tar.gz -> leatherman-1.12.2.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08a4f38990ebf288dd7e3a8f297b2b35
+_md5_=77380a9cc2b8448455ff4fdb4372d6ad
diff --git a/metadata/md5-cache/dev-libs/libev-4.33 b/metadata/md5-cache/dev-libs/libev-4.33
index 58cd56556bb1..76a8d084e33f 100644
--- a/metadata/md5-cache/dev-libs/libev-4.33
+++ b/metadata/md5-cache/dev-libs/libev-4.33
@@ -4,9 +4,9 @@ DESCRIPTION=A high-performance event loop/event model with lots of feature
 EAPI=7
 HOMEPAGE=http://software.schmorp.de/pkg/libev.html
 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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( BSD GPL-2 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.33.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fef56a2a1abd62f9e8d381c97a8c6c40
+_md5_=0c3eb5a8b5fab26c4afa27e3b4e46541
diff --git a/metadata/md5-cache/dev-libs/libinput-1.16.3 b/metadata/md5-cache/dev-libs/libinput-1.16.3
index 912bf637180f..e3c31d51aa98 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.16.3
+++ b/metadata/md5-cache/dev-libs/libinput-1.16.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=7
 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 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~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
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.16.3.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=3ae02da1ceb031d5c3baa39a2a538d22
+_md5_=5d3163f1e96e85696d40931d4acea317
diff --git a/metadata/md5-cache/dev-libs/libinput-1.16.2 b/metadata/md5-cache/dev-libs/libinput-1.16.4
similarity index 99%
rename from metadata/md5-cache/dev-libs/libinput-1.16.2
rename to metadata/md5-cache/dev-libs/libinput-1.16.4
index f306a99b3157..4fc1deeb17eb 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.16.2
+++ b/metadata/md5-cache/dev-libs/libinput-1.16.4
@@ -10,6 +10,6 @@ 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
 RESTRICT=!test? ( test )
 SLOT=0/10
-SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.16.2.tar.xz
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.16.4.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=3ae02da1ceb031d5c3baa39a2a538d22
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.1-r1 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.1-r1
deleted file mode 100644
index cc8b6446dd29..000000000000
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND==dev-lang/lua-5.1*
-DESCRIPTION=Bit Operations Library for the Lua Programming Language
-EAPI=5
-HOMEPAGE=http://bitop.luajit.org
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND==dev-lang/lua-5.1*
-SLOT=0
-SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e8d16242d91e34ac362f7d644b6d7bb
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2
deleted file mode 100644
index bcc037f8b1ca..000000000000
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/lua virtual/pkgconfig
-DESCRIPTION=Bit Operations Library for the Lua Programming Language
-EAPI=5
-HOMEPAGE=http://bitop.luajit.org
-KEYWORDS=amd64 ~arm hppa ~mips x86
-LICENSE=MIT
-RDEPEND=dev-lang/lua
-SLOT=0
-SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=339b6875e957827d32cf541068010404
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r100 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r100
new file mode 100644
index 000000000000..0ef80885a543
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r100
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 )
+DESCRIPTION=Bit Operations Library for the Lua Programming Language
+EAPI=7
+HOMEPAGE=http://bitop.luajit.org
+IUSE=test lua_targets_lua5-1 lua_targets_lua5-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
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 )
+REQUIRED_USE=|| ( lua_targets_lua5-1 lua_targets_lua5-2 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ebea2a72d7e8cbb8a9e0a64ed8243284
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r2
similarity index 88%
rename from metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1
rename to metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r2
index 44565f3306ed..3867371bba02 100644
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1
+++ b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1.5-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(-)?] virtual/pkgconfig
+DEPEND=>=dev-lang/lua-5.1.5-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(-)?] virtual/pkgconfig
 DESCRIPTION=Bit Operations Library for the Lua Programming Language
 EAPI=5
 HOMEPAGE=http://bitop.luajit.org
 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 ~mips ppc ppc64 sparc x86
 LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1.5-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(-)?]
+RDEPEND=>=dev-lang/lua-5.1.5-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(-)?]
 SLOT=0
 SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=598ffb8a1bdef962f5fb36b59b1f1669
+_md5_=b922d27917cb4dd18530eb78aedbcf5c
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 8ae195bc2cb1..4b83ecbe44dc 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/busted-2.0.0-r101 b/metadata/md5-cache/dev-lua/busted-2.0.0-r101
new file mode 100644
index 000000000000..8609c0976239
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/busted-2.0.0-r101
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( >=dev-lua/busted-2.0.0-r100 >=dev-lua/lua_cliargs-3.0_p2-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luafilesystem-1.8.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luasystem-0.2.1_p0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/dkjson-2.5-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/say-1.3_p1-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luassert-1.8.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/lua-term-0.7-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/penlight-1.7.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/mediator_lua-1.1.2_p0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+DEFINED_PHASES=install test
+DEPEND=>=dev-lua/lua_cliargs-3.0_p2-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luafilesystem-1.8.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luasystem-0.2.1_p0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/dkjson-2.5-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/say-1.3_p1-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luassert-1.8.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/lua-term-0.7-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/penlight-1.7.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/mediator_lua-1.1.2_p0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=Elegant Lua unit testing
+EAPI=7
+HOMEPAGE=http://olivinelabs.com/busted/
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lua/lua_cliargs-3.0_p2-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luafilesystem-1.8.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luasystem-0.2.1_p0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/dkjson-2.5-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/say-1.3_p1-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luassert-1.8.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/lua-term-0.7-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/penlight-1.7.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/mediator_lua-1.1.2_p0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Olivine-Labs/busted/archive/v2.0.0.tar.gz -> busted-2.0.0.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d14b4be6cbc0a6c58c3af4c5f13af973
diff --git a/metadata/md5-cache/dev-lua/dkjson-2.5-r100 b/metadata/md5-cache/dev-lua/dkjson-2.5-r100
new file mode 100644
index 000000000000..1f7f6cbe450b
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/dkjson-2.5-r100
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+DEFINED_PHASES=install test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=David Kolf's JSON module for Lua
+EAPI=7
+HOMEPAGE=http://dkolf.de/src/dkjson-lua.fsl/
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.5.tar.gz?uuid=release_2_5 -> dkjson-2.5.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f25c474b68037934083305a7038e0d7a
diff --git a/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100 b/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
new file mode 100644
index 000000000000..390d731aef94
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install setup
+DEPEND=lua_single_target_luajit? ( dev-lua/penlight[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/penlight[lua_targets_lua5-1(-)] )
+DESCRIPTION=A LuaDoc-compatible documentation generation system
+EAPI=7
+HOMEPAGE=https://stevedonovan.github.io/ldoc/
+IUSE=lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=lua_single_target_luajit? ( dev-lua/penlight[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/penlight[lua_targets_lua5-1(-)] )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/stevedonovan/LDoc/archive/1.4.6.tar.gz -> ldoc-1.4.6.tar.gz
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3a4f775c00df40f6df6da1555af1e3a8
diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.2-r100 b/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
new file mode 100644
index 000000000000..ca31257b5550
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
@@ -0,0 +1,16 @@
+BDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DEFINED_PHASES=compile install prepare test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/gobject-introspection dev-libs/glib dev-libs/libffi:0= test? ( x11-libs/cairo[glib] x11-libs/gtk+[introspection] x11-base/xorg-server[xvfb] x11-apps/xhost )
+DESCRIPTION=Lua bindings using gobject-introspection
+EAPI=7
+HOMEPAGE=https://github.com/pavouk/lgi
+IUSE=examples test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) dev-libs/gobject-introspection dev-libs/glib dev-libs/libffi:0=
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pavouk/lgi/archive/0.9.2.tar.gz -> lgi-0.9.2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=14130788ff0500fc21334a9a347afe7a
diff --git a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r100 b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r100
new file mode 100644
index 000000000000..0bf38f5ace4a
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r100
@@ -0,0 +1,16 @@
+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 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=Parsing Expression Grammars for Lua
+EAPI=7
+HOMEPAGE=http://www.inf.puc-rio.br/~roberto/lpeg/
+IUSE=debug test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~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-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+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	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=807ceb6f2a83f616b26e7349622262d4
diff --git a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101 b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
new file mode 100644
index 000000000000..4a106dee80ba
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+DEFINED_PHASES=compile install prepare test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+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-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~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-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+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	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=44b89a4031850a93291bfcf9fc788c0b
diff --git a/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1 b/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
index a3ddedfa32f1..2f908a6ef76f 100644
--- a/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
+++ b/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Command line argument parser for the Lua Programming Language
 EAPI=7
 HOMEPAGE=https://github.com/mpeterv/argparse
 IUSE=doc luajit test
-KEYWORDS=~amd64 ~arm ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:= luajit? ( dev-lang/luajit:2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpeterv/argparse/archive/0.6.0.tar.gz -> lua-argparse-0.6.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=44246c7ee8105526e174919cc2a4cca8
+_md5_=37750c657c0a6bd8600860326667df0b
diff --git a/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r100 b/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r100
new file mode 100644
index 000000000000..8e6363441d32
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r100
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( >=dev-lua/busted-2.0.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+DEFINED_PHASES=compile install test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=Command line argument parser for the Lua Programming Language
+EAPI=7
+HOMEPAGE=https://github.com/mpeterv/argparse
+IUSE=doc test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mpeterv/argparse/archive/0.6.0.tar.gz -> lua-argparse-0.6.0.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6d855b07cd0912e47db989be2843f061
diff --git a/metadata/md5-cache/dev-lua/lua-term-0.7-r100 b/metadata/md5-cache/dev-lua/lua-term-0.7-r100
new file mode 100644
index 000000000000..f1960d08036c
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua-term-0.7-r100
@@ -0,0 +1,15 @@
+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-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=Terminal operations for Lua
+EAPI=7
+HOMEPAGE=https://github.com/hoelzro/lua-term
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+SLOT=0
+SRC_URI=https://github.com/hoelzro/lua-term/archive/0.07.tar.gz -> lua-term-0.7.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=acf7df10e397b2c188188183d8fcc626
diff --git a/metadata/md5-cache/dev-lua/lua-utf8-0.1.1 b/metadata/md5-cache/dev-lua/lua-utf8-0.1.1
deleted file mode 100644
index b27945c33686..000000000000
--- a/metadata/md5-cache/dev-lua/lua-utf8-0.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test
-DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
-DESCRIPTION=UTF-8 support for Lua
-EAPI=7
-HOMEPAGE=https://github.com/starwing/luautf8
-IUSE=luajit test
-KEYWORDS=~amd64 ~arm ~ppc64
-LICENSE=MIT
-RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/starwing/luautf8/archive/0.1.1.tar.gz -> lua-utf8-0.1.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=656fc2466f3c99448ae0431ed20bbc34
diff --git a/metadata/md5-cache/dev-lua/lua-utf8-0.1.3 b/metadata/md5-cache/dev-lua/lua-utf8-0.1.3
new file mode 100644
index 000000000000..5f5d9b71551a
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua-utf8-0.1.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install test
+DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:= )
+DESCRIPTION=A UTF-8 support module for Lua and LuaJIT
+EAPI=7
+HOMEPAGE=https://github.com/starwing/luautf8
+IUSE=luajit test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/starwing/luautf8/archive/0.1.3.tar.gz -> lua-utf8-0.1.3.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=115cdba5c99cd48d7b91862bb7eee5fa
diff --git a/metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100 b/metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100
new file mode 100644
index 000000000000..c66f0415bb51
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=A UTF-8 support module for Lua and LuaJIT
+EAPI=7
+HOMEPAGE=https://github.com/starwing/luautf8
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/starwing/luautf8/archive/0.1.3.tar.gz -> lua-utf8-0.1.3.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=549fc136627bd68d5deaff89574e6d6b
diff --git a/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100 b/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100
new file mode 100644
index 000000000000..c8ba31c6546d
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DESCRIPTION=A command-line argument parsing module for Lua
+EAPI=7
+HOMEPAGE=https://github.com/amireh/lua_cliargs
+IUSE=examples lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+SLOT=0
+SRC_URI=https://github.com/amireh/lua_cliargs/archive/v3.0-2.tar.gz -> lua_cliargs-3.0_p2.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1ce471aae03bd67a8d49b39c2cc10b0e
diff --git a/metadata/md5-cache/dev-lua/luacheck-0.20.0 b/metadata/md5-cache/dev-lua/luacheck-0.20.0-r1
similarity index 58%
rename from metadata/md5-cache/dev-lua/luacheck-0.20.0
rename to metadata/md5-cache/dev-lua/luacheck-0.20.0-r1
index 8526f602e08b..73ed4ce33a7f 100644
--- a/metadata/md5-cache/dev-lua/luacheck-0.20.0
+++ b/metadata/md5-cache/dev-lua/luacheck-0.20.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install test
-DEPEND=dev-lua/luafilesystem[luajit=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( dev-lua/busted )
+DEPEND=dev-lua/luafilesystem[luajit(-)=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( dev-lua/busted )
 DESCRIPTION=A tool for linting and static analysis of Lua code
 EAPI=6
 HOMEPAGE=https://github.com/mpeterv/luacheck
 IUSE=doc luajit test
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-lua/luafilesystem[luajit=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
+RDEPEND=dev-lua/luafilesystem[luajit(-)=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpeterv/luacheck/archive/0.20.0.tar.gz -> luacheck-0.20.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=efe04a1bb16b7a41fca362dae6955206
+_md5_=6cfb80646cfd417be7fa57bf12d5eebc
diff --git a/metadata/md5-cache/dev-lua/luacheck-0.23.0 b/metadata/md5-cache/dev-lua/luacheck-0.23.0
deleted file mode 100644
index 61408364818c..000000000000
--- a/metadata/md5-cache/dev-lua/luacheck-0.23.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( dev-lua/lua-argparse[luajit=] dev-lua/luafilesystem[luajit(-)=] dev-lua/lua-utf8[luajit=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) dev-lua/busted )
-DEFINED_PHASES=compile install test
-DEPEND=dev-lua/lua-argparse[luajit=] dev-lua/luafilesystem[luajit(-)=] dev-lua/lua-utf8[luajit=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
-DESCRIPTION=A tool for linting and static analysis of Lua code
-EAPI=7
-HOMEPAGE=https://github.com/mpeterv/luacheck
-IUSE=doc luajit test
-KEYWORDS=~amd64 ~arm ~ppc64
-LICENSE=MIT
-RDEPEND=dev-lua/lua-argparse[luajit=] dev-lua/luafilesystem[luajit(-)=] dev-lua/lua-utf8[luajit=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mpeterv/luacheck/archive/0.23.0.tar.gz -> luacheck-0.23.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f7391bdd069902f047384fe2913a2203
diff --git a/metadata/md5-cache/dev-lua/luacheck-0.23.0-r1 b/metadata/md5-cache/dev-lua/luacheck-0.23.0-r1
new file mode 100644
index 000000000000..718a7c2fc25e
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luacheck-0.23.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( dev-lua/lua-argparse[luajit(-)=] dev-lua/luafilesystem[luajit(-)=] dev-lua/lua-utf8[luajit(-)=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) dev-lua/busted )
+DEFINED_PHASES=compile install test
+DEPEND=dev-lua/lua-argparse[luajit(-)=] dev-lua/luafilesystem[luajit(-)=] dev-lua/lua-utf8[luajit(-)=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
+DESCRIPTION=A tool for linting and static analysis of Lua code
+EAPI=7
+HOMEPAGE=https://github.com/mpeterv/luacheck
+IUSE=doc luajit test
+KEYWORDS=~amd64 ~arm ~ppc64
+LICENSE=MIT
+RDEPEND=dev-lua/lua-argparse[luajit(-)=] dev-lua/luafilesystem[luajit(-)=] dev-lua/lua-utf8[luajit(-)=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mpeterv/luacheck/archive/0.23.0.tar.gz -> luacheck-0.23.0.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=415b5ea1ad1c675cbeef4daa5762183d
diff --git a/metadata/md5-cache/dev-lua/luacheck-0.23.0-r100 b/metadata/md5-cache/dev-lua/luacheck-0.23.0-r100
new file mode 100644
index 000000000000..89a0c9a99ae1
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luacheck-0.23.0-r100
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( >=dev-lua/busted-2.0.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/lua-argparse-0.6.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/lua-utf8-0.1.3-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luafilesystem-1.8.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] )
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lua/lua-argparse-0.6.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/lua-utf8-0.1.3-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luafilesystem-1.8.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?]
+DESCRIPTION=A tool for linting and static analysis of Lua code
+EAPI=7
+HOMEPAGE=https://github.com/mpeterv/luacheck
+IUSE=doc test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lua/lua-argparse-0.6.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/lua-utf8-0.1.3-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/luafilesystem-1.8.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mpeterv/luacheck/archive/0.23.0.tar.gz -> luacheck-0.23.0.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6c5557996026c9601ec0235e5935cea8
diff --git a/metadata/md5-cache/dev-lua/luadbi-0.7.2-r100 b/metadata/md5-cache/dev-lua/luadbi-0.7.2-r101
similarity index 85%
rename from metadata/md5-cache/dev-lua/luadbi-0.7.2-r100
rename to metadata/md5-cache/dev-lua/luadbi-0.7.2-r101
index 7699cc83cc0e..300906c71dbd 100644
--- a/metadata/md5-cache/dev-lua/luadbi-0.7.2-r100
+++ b/metadata/md5-cache/dev-lua/luadbi-0.7.2-r101
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( dev-lua/busted dev-lua/luarocks )
+BDEPEND=virtual/pkgconfig test? ( >=dev-lua/busted-2.0.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] dev-lua/luarocks )
 DEFINED_PHASES=compile install prepare test
 DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite )
 DESCRIPTION=A database interface library for Lua
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mwild1/luadbi/archive/v0.7.2.tar.gz -> luadbi-0.7.2.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c6cbb260d8cd4690761f4caed2a275b2
+_md5_=9f164667e90ed6fcc07913db415290f1
diff --git a/metadata/md5-cache/dev-lua/luajson-1.3.4 b/metadata/md5-cache/dev-lua/luajson-1.3.4
new file mode 100644
index 000000000000..45ffb0b0b2b6
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luajson-1.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=JSON Parser/Constructor for Lua
+EAPI=7
+HOMEPAGE=https://www.eharning.us/wiki/luajson/
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-lua/lpeg[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?]
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/harningt/luajson/archive/1.3.4.tar.gz -> luajson-1.3.4.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e9450886a2f7b28d9934cfa14f404e7a
diff --git a/metadata/md5-cache/dev-lua/luasec-0.9-r100 b/metadata/md5-cache/dev-lua/luasec-0.9-r100
deleted file mode 100644
index 1bb2a65ff745..000000000000
--- a/metadata/md5-cache/dev-lua/luasec-0.9-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lua/luasocket-3.0_rc1_p20200328-r100 libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated] )
-DESCRIPTION=Lua binding for OpenSSL library to provide TLS/SSL communication
-EAPI=7
-HOMEPAGE=https://github.com/brunoos/luasec
-IUSE=libressl lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lua/luasocket-3.0_rc1_p20200328-r100 libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated] )
-REQUIRED_USE=|| ( lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
-SLOT=0
-SRC_URI=https://github.com/brunoos/luasec/archive/v0.9.tar.gz -> luasec-0.9.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6abba7daa649b221b0dbb2df08592f47
diff --git a/metadata/md5-cache/dev-lua/luasec-0.9-r101 b/metadata/md5-cache/dev-lua/luasec-0.9-r101
new file mode 100644
index 000000000000..90720ed9a8b4
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luasec-0.9-r101
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-lua/luasocket-3.0_rc1_p20200328-r100[lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated] )
+DESCRIPTION=Lua binding for OpenSSL library to provide TLS/SSL communication
+EAPI=7
+HOMEPAGE=https://github.com/brunoos/luasec
+IUSE=libressl lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lua/luasocket-3.0_rc1_p20200328-r100[lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated] )
+REQUIRED_USE=|| ( lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+SLOT=0
+SRC_URI=https://github.com/brunoos/luasec/archive/v0.9.tar.gz -> luasec-0.9.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a722343827143a05d0c788cb29d36c72
diff --git a/metadata/md5-cache/dev-lua/luassert-1.8.0-r101 b/metadata/md5-cache/dev-lua/luassert-1.8.0-r101
new file mode 100644
index 000000000000..2c58e5b04481
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luassert-1.8.0-r101
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( >=dev-lua/busted-2.0.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] >=dev-lua/say-1.3_p1-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+DEFINED_PHASES=install test
+DEPEND=>=dev-lua/say-1.3_p1-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=Assertion library for Lua
+EAPI=7
+HOMEPAGE=http://olivinelabs.com/busted/
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lua/say-1.3_p1-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Olivine-Labs/luassert/archive/v1.8.0.tar.gz -> luassert-1.8.0.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f77ce6aba0f29774bcf77eee31f81158
diff --git a/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r101 b/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r101
new file mode 100644
index 000000000000..9fca11bdf527
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r101
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( >=dev-lua/busted-2.0.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+DEFINED_PHASES=compile install test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=Platform independent system calls for Lua
+EAPI=7
+HOMEPAGE=https://github.com/o-lim/luasystem/
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/o-lim/luasystem/archive/v0.2.1-0.tar.gz -> luasystem-0.2.1_p0.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f6450c2acec3b0b07888f3a13461dc67
diff --git a/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101 b/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
new file mode 100644
index 000000000000..d74780ede593
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( >=dev-lua/busted-2.0.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+DEFINED_PHASES=install test
+DESCRIPTION=Mediator pattern implementation for pub-sub management
+EAPI=7
+HOMEPAGE=http://olivinelabs.com/mediator_lua/
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz -> mediator_lua-1.1.2_p0.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=92ee65d39dd5959f4fda6b81bfa30375
diff --git a/metadata/md5-cache/dev-lua/mpack-1.0.4-r100 b/metadata/md5-cache/dev-lua/mpack-1.0.4-r100
new file mode 100644
index 000000000000..ea3500d30d30
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/mpack-1.0.4-r100
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] )
+DEFINED_PHASES=compile install test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=Lua bindings for libmpack
+EAPI=7
+HOMEPAGE=https://github.com/libmpack/libmpack/
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/libmpack/libmpack/archive/1.0.4.tar.gz -> mpack-1.0.4.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=409388f8300f412366eb32a23469d327
diff --git a/metadata/md5-cache/dev-lua/penlight-1.9.2 b/metadata/md5-cache/dev-lua/penlight-1.9.2
new file mode 100644
index 000000000000..4b4e74e34fcf
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/penlight-1.9.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( >=dev-lang/lua-5.1:= )
+DEFINED_PHASES=install test
+DEPEND=>=dev-lang/lua-5.1:=
+DESCRIPTION=Lua utility libraries loosely based on the Python standard libraries
+EAPI=7
+HOMEPAGE=https://github.com/Tieske/Penlight,
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lua/luafilesystem >=dev-lang/lua-5.1:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Tieske/Penlight/archive/1.9.2.tar.gz -> penlight-1.9.2.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a977e243d75f83c504af98d8df4e98c5
diff --git a/metadata/md5-cache/dev-lua/penlight-1.9.2-r101 b/metadata/md5-cache/dev-lua/penlight-1.9.2-r101
new file mode 100644
index 000000000000..6c02eeb06a06
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/penlight-1.9.2-r101
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+DEFINED_PHASES=install test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+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-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lua/luafilesystem-1.8.0-r100 lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Tieske/Penlight/archive/1.9.2.tar.gz -> penlight-1.9.2.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5f1923d3ee861cbacfe1c294fa270465
diff --git a/metadata/md5-cache/dev-lua/say-1.3_p1-r101 b/metadata/md5-cache/dev-lua/say-1.3_p1-r101
new file mode 100644
index 000000000000..d543bc219ca2
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/say-1.3_p1-r101
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( >=dev-lua/busted-2.0.0-r100[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] ) lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DEFINED_PHASES=install test
+DESCRIPTION=Lua String Hashing/Indexing Library
+EAPI=7
+HOMEPAGE=http://olivinelabs.com/busted/
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz -> say-1.3_p1.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0b1d550bdf24401e310d1cf3ac5869e5
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 3e99ee2bbc93..3a3b581d87c4 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/camlbz2-0.6.0 b/metadata/md5-cache/dev-ml/camlbz2-0.6.0
deleted file mode 100644
index 1c48a9a73e8f..000000000000
--- a/metadata/md5-cache/dev-ml/camlbz2-0.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml bindings for libbz (AKA, bzip2)
-EAPI=5
-HOMEPAGE=http://camlbz2.forge.ocamlcore.org/
-IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt]
-SLOT=0/0.6.0
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/72/camlbz2-0.6.0.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=0ba8d11a5df6d82082e665cb66098d71
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.04_p1 b/metadata/md5-cache/dev-ml/camlp4-4.04_p1
deleted file mode 100644
index 64188a93ba37..000000000000
--- a/metadata/md5-cache/dev-ml/camlp4-4.04_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND==dev-lang/ocaml-4.04*:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=System for writing extensible parsers for programming languages
-EAPI=5
-HOMEPAGE=https://github.com/camlp4/camlp4
-IUSE=+ocamlopt
-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-4.04*:=[ocamlopt?]
-SLOT=0/4.04_p1
-SRC_URI=https://github.com/camlp4/camlp4/archive/4.04+1.tar.gz -> camlp4-4.04_p1.tar.gz
-_md5_=786979907abd54cab444b6268ac77e2c
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.05_p1 b/metadata/md5-cache/dev-ml/camlp4-4.05_p1
deleted file mode 100644
index bbb87214fe6f..000000000000
--- a/metadata/md5-cache/dev-ml/camlp4-4.05_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND==dev-lang/ocaml-4.05*:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=System for writing extensible parsers for programming languages
-EAPI=5
-HOMEPAGE=https://github.com/camlp4/camlp4
-IUSE=+ocamlopt
-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-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_=71d1b2aa4c46e6b567eb33acfa3fc579
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.0 b/metadata/md5-cache/dev-ml/cmdliner-1.0.0
deleted file mode 100644
index 35d382a308ed..000000000000
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Declarative definition of command line interfaces for OCaml
-EAPI=5
-HOMEPAGE=https://erratique.ch/software/cmdliner
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
-RESTRICT=!test? ( test )
-SLOT=0/1.0.0
-SRC_URI=https://erratique.ch/software/cmdliner/releases/cmdliner-1.0.0.tbz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=c119c0eda463610e855d6b4ce3f9c830
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.1 b/metadata/md5-cache/dev-ml/cmdliner-1.0.1
deleted file mode 100644
index fa7be826e389..000000000000
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Declarative definition of command line interfaces for OCaml
-EAPI=5
-HOMEPAGE=https://erratique.ch/software/cmdliner
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
-RESTRICT=!test? ( test )
-SLOT=0/1.0.1
-SRC_URI=https://erratique.ch/software/cmdliner/releases/cmdliner-1.0.1.tbz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=c119c0eda463610e855d6b4ce3f9c830
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.2 b/metadata/md5-cache/dev-ml/cmdliner-1.0.2
deleted file mode 100644
index 58f480b71c52..000000000000
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Declarative definition of command line interfaces for OCaml
-EAPI=5
-HOMEPAGE=https://erratique.ch/software/cmdliner
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
-RESTRICT=!test? ( test )
-SLOT=0/1.0.2
-SRC_URI=https://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=c119c0eda463610e855d6b4ce3f9c830
diff --git a/metadata/md5-cache/dev-ml/cudf-0.8-r1 b/metadata/md5-cache/dev-ml/cudf-0.8-r1
deleted file mode 100644
index 2559203b5662..000000000000
--- a/metadata/md5-cache/dev-ml/cudf-0.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-libs/glib:2 dev-ml/camlp4:= dev-ml/cppo:= test? ( dev-ml/ounit ) dev-ml/findlib dev-ml/ocamlbuild dev-lang/perl
-DESCRIPTION=Library to parse, pretty print, and evaluate CUDF documents
-EAPI=5
-HOMEPAGE=http://www.mancoosi.org/cudf/
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-libs/glib:2 dev-ml/camlp4:= dev-ml/cppo:=
-RESTRICT=!test? ( test )
-SLOT=0/0.8
-SRC_URI=https://gforge.inria.fr/frs/download.php/file/34659/cudf-0.8.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ba1331a22b4029c5e7564fcebbdac9dd
diff --git a/metadata/md5-cache/dev-ml/dose3-5.0.1 b/metadata/md5-cache/dev-ml/dose3-5.0.1
deleted file mode 100644
index 927dc4bdb596..000000000000
--- a/metadata/md5-cache/dev-ml/dose3-5.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/cudf:= >=dev-ml/extlib-1.7.0:= dev-ml/ocaml-re:= dev-ml/cppo:= parmap? ( dev-ml/parmap:= ) zip? ( dev-ml/camlzip:= ) bzip2? ( dev-ml/camlbz2:= ) >=dev-ml/ocamlgraph-1.8.6:= xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm ) dev-ml/findlib dev-ml/ocamlbuild test? ( dev-python/pyyaml[libyaml] )
-DESCRIPTION=Library to perform analysis on package repositories
-EAPI=5
-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 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/cudf:= >=dev-ml/extlib-1.7.0:= dev-ml/ocaml-re:= dev-ml/cppo:= parmap? ( dev-ml/parmap:= ) zip? ( dev-ml/camlzip:= ) bzip2? ( dev-ml/camlbz2:= ) >=dev-ml/ocamlgraph-1.8.6:= xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm )
-RESTRICT=test
-SLOT=0/5.0.1
-SRC_URI=https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=25ba7b6e057ca6cbde1e880a304e89d4
diff --git a/metadata/md5-cache/dev-ml/findlib-1.7.1 b/metadata/md5-cache/dev-ml/findlib-1.7.1
deleted file mode 100644
index 526c72ee22c7..000000000000
--- a/metadata/md5-cache/dev-ml/findlib-1.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
-DESCRIPTION=OCaml tool to find/use non-standard packages
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
-IUSE=doc +ocamlopt tk
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
-SLOT=0
-SRC_URI=http://download.camlcity.org/download/findlib-1.7.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=393e03aeb11bb5c64e27efb27c8cbd2f
diff --git a/metadata/md5-cache/dev-ml/findlib-1.7.2 b/metadata/md5-cache/dev-ml/findlib-1.7.2
deleted file mode 100644
index 7a5341a4e063..000000000000
--- a/metadata/md5-cache/dev-ml/findlib-1.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
-DESCRIPTION=OCaml tool to find/use non-standard packages
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
-IUSE=doc +ocamlopt tk
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
-SLOT=0
-SRC_URI=http://download.camlcity.org/download/findlib-1.7.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ed9d8d1d3bfd4b472ba0fdd13ca448fb
diff --git a/metadata/md5-cache/dev-ml/findlib-1.7.3 b/metadata/md5-cache/dev-ml/findlib-1.7.3
deleted file mode 100644
index 8441f6e3bee8..000000000000
--- a/metadata/md5-cache/dev-ml/findlib-1.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
-DESCRIPTION=OCaml tool to find/use non-standard packages
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
-IUSE=doc +ocamlopt tk
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
-SLOT=0
-SRC_URI=http://download.camlcity.org/download/findlib-1.7.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a1895dd755c1a43f95574e39e6033df3
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0
deleted file mode 100644
index 6ea85132d6c2..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-10.0.0:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,debug?] !sys-devel/llvm[ocaml(-)] !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-10.0.0:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,debug?] !sys-devel/llvm[ocaml(-)]
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR )
-RESTRICT=!test? ( test )
-SLOT=0/10.0.0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56216dd79fa5182bfbdbbf85bc94d473
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
index 6752423b6079..e76236bf28d7 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/11.0.0.9999
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b46ae3ac98a45f26d860dbc860857552
+_md5_=b5e289d3c975d2dec6ccf1582451b138
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
index 9ba254007275..496b7943449b 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/12.0.0.9999
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b603bc51cc1dd46ea9e911ffc11401a
+_md5_=e8e6287fb3d56297a80f5a7d1b3b48d3
diff --git a/metadata/md5-cache/dev-ml/menhir-20170712 b/metadata/md5-cache/dev-ml/menhir-20170712
deleted file mode 100644
index 1fa3b3ab66e2..000000000000
--- a/metadata/md5-cache/dev-ml/menhir-20170712
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=LR(1) parser generator for the OCaml language
-EAPI=5
-HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
-IUSE=examples +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
-SLOT=0/20170712
-SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9107d7895b69fb99e36071feaf352336
diff --git a/metadata/md5-cache/dev-ml/menhir-20171013 b/metadata/md5-cache/dev-ml/menhir-20171013
deleted file mode 100644
index b7763ad09e5b..000000000000
--- a/metadata/md5-cache/dev-ml/menhir-20171013
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=LR(1) parser generator for the OCaml language
-EAPI=5
-HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
-IUSE=examples +ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
-SLOT=0/20171013
-SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20171013.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b112ac03ed80bbee59a3d7d262c3dbf5
diff --git a/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0 b/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0
index 96137c13a726..02f3706c10a6 100644
--- a/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0
+++ b/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0
@@ -5,11 +5,11 @@ DESCRIPTION=A Module::Build subclass for building Alien:: modules and their libr
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Alien-Base-ModuleBuild
 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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-Build-1.200.0 dev-perl/Archive-Extract >=virtual/perl-Archive-Tar-1.400.0 >=dev-perl/Capture-Tiny-0.170.0 >=dev-perl/File-chdir-0.100.500 >=virtual/perl-HTTP-Tiny-0.44.0 >=dev-perl/Module-Build-0.400.400 >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Shell-Config-Generate dev-perl/Shell-Guess dev-perl/Sort-Versions >=virtual/perl-Text-ParseWords-3.260.0 dev-perl/URI virtual/perl-parent dev-perl/HTML-Parser virtual/perl-JSON-PP dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=58545d64938a789c168f17751051732f
+_md5_=796fd189469580c61feed41b987156a9
diff --git a/metadata/md5-cache/dev-perl/Alien-Build-2.330.0 b/metadata/md5-cache/dev-perl/Alien-Build-2.330.0
index fa84a5fece63..2f7bc5cf71fa 100644
--- a/metadata/md5-cache/dev-perl/Alien-Build-2.330.0
+++ b/metadata/md5-cache/dev-perl/Alien-Build-2.330.0
@@ -5,11 +5,11 @@ DESCRIPTION=Build external dependencies for use in CPAN
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Alien-Build
 IUSE=minimal test zip examples
-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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=zip? ( dev-perl/Archive-Zip ) virtual/perl-Archive-Tar >=dev-perl/Capture-Tiny-0.170.0 virtual/perl-ExtUtils-CBuilder >=virtual/perl-ExtUtils-MakeMaker-6.640.0 >=virtual/perl-ExtUtils-ParseXS-3.300.0 >=dev-perl/FFI-CheckLib-0.110.0 >=dev-perl/File-Which-1.100.0 dev-perl/File-chdir virtual/perl-JSON-PP >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=virtual/perl-Test-Simple-1.302.96 >=virtual/perl-Text-ParseWords-3.260.0 virtual/pkgconfig dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.33.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4a9fab4946cb41131f2dd271232dc321
+_md5_=40ac0d345f273caf2f9eab90af8a1c68
diff --git a/metadata/md5-cache/dev-perl/Alien-Libxml2-0.160.0 b/metadata/md5-cache/dev-perl/Alien-Libxml2-0.160.0
index b70f252d7996..87b525aeeb1c 100644
--- a/metadata/md5-cache/dev-perl/Alien-Libxml2-0.160.0
+++ b/metadata/md5-cache/dev-perl/Alien-Libxml2-0.160.0
@@ -5,11 +5,11 @@ DESCRIPTION=Install the C libxml2 library on your system
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Alien-Libxml2
 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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-Build-2.120.0 dev-libs/libxml2:2= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d33d4b13cc780b1bf74ab6a0b717e291
+_md5_=fa82dff62094c9706eb6a16427934ee0
diff --git a/metadata/md5-cache/dev-perl/Archive-Extract-0.860.0 b/metadata/md5-cache/dev-perl/Archive-Extract-0.860.0
index 7addd30a190a..41136baf5897 100644
--- a/metadata/md5-cache/dev-perl/Archive-Extract-0.860.0
+++ b/metadata/md5-cache/dev-perl/Archive-Extract-0.860.0
@@ -5,11 +5,11 @@ DESCRIPTION=Generic archive extracting mechanism
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Archive-Extract
 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 ~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.86.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ba1af9cd72628020b240ead049077ea5
+_md5_=06e40b6f16cfcdbf481dbae58ab755b5
diff --git a/metadata/md5-cache/dev-perl/Archive-Zip-1.680.0 b/metadata/md5-cache/dev-perl/Archive-Zip-1.680.0
index a249ea30b01f..d9b326abff25 100644
--- a/metadata/md5-cache/dev-perl/Archive-Zip-1.680.0
+++ b/metadata/md5-cache/dev-perl/Archive-Zip-1.680.0
@@ -5,11 +5,11 @@ DESCRIPTION=A wrapper that lets you read Zip archive members as if they were fil
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Archive-Zip
 IUSE=test examples
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Compress-Raw-Zlib-2.17.0 virtual/perl-Encode virtual/perl-File-Path >=virtual/perl-File-Spec-0.800.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.68.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7c2cf0b5715fb8d84a64d515283ce4a3
+_md5_=82d0483b47d634e4beec0dcbea6ddbd9
diff --git a/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1 b/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1
index f2efc899cb42..e30231581d0a 100644
--- a/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1
+++ b/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=additional B helpers to check COW status
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/B-COW
 IUSE=test examples
-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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ed251d8e803fcf6caae3524199adb2fd
+_md5_=70df85a7823bc750af773e4a39b62194
diff --git a/metadata/md5-cache/dev-perl/Clone-0.450.0 b/metadata/md5-cache/dev-perl/Clone-0.450.0
index 0f2c0254170c..d696a88ca47e 100644
--- a/metadata/md5-cache/dev-perl/Clone-0.450.0
+++ b/metadata/md5-cache/dev-perl/Clone-0.450.0
@@ -5,11 +5,11 @@ DESCRIPTION=Recursively copy Perl datatypes
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Clone
 IUSE=test
-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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.45.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a952880f1898ae540b65e87218c8e927
+_md5_=a3046003bdb89ec510d82594186cf09a
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
index d3b09b2dfb69..8d9c746d67dd 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
@@ -5,11 +5,11 @@ DESCRIPTION=Guess OpenSSL include path
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-Guess
 IUSE=libressl 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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) 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	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=439c62dd090238ea9123082f48638a83
+_md5_=3ccb8f09838f42baa94dc49e7831aac1
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0
index f574a9a79af9..1cf9ee6db9cd 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0
@@ -5,11 +5,11 @@ DESCRIPTION=RSA encoding and decoding using the OpenSSL libraries
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-RSA
 IUSE=libressl 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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0f555df2cce6dd83225467d34e550723
+_md5_=a0ee0808aee19e4670698d773e25460b
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0
index 2daa4d6506d9..184dcf7b26cc 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0
@@ -5,10 +5,10 @@ DESCRIPTION=OpenSSL/LibreSSL pseudo-random number generator access
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-Random
 IUSE=libressl
-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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1a8cb14b83a9099a964994831ac35405
+_md5_=feba63680a0515c034e21ba0349d067a
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0-r1 b/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0-r1
index c99e025a6647..841603e5034d 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0-r1
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBD-mysql
 IUSE=mariadb +mysql test +ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBI-1.609.0 >=dev-perl/Devel-CheckLib-1.109.0 mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] ) dev-lang/perl:=
 REQUIRED_USE=^^ ( mysql mariadb )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2110987970cf588525a1dea68f50cc21
+_md5_=d61c7f03409fb80b9ccf7ca3ff108677
diff --git a/metadata/md5-cache/dev-perl/Devel-Hide-0.1.300 b/metadata/md5-cache/dev-perl/Devel-Hide-0.1.300
index 03e112c434ab..606c59fdf4d5 100644
--- a/metadata/md5-cache/dev-perl/Devel-Hide-0.1.300
+++ b/metadata/md5-cache/dev-perl/Devel-Hide-0.1.300
@@ -5,11 +5,11 @@ DESCRIPTION=Forces the unavailability of specified Perl modules (for testing)
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Devel-Hide
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0013.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2bd2cf504b4fc75a73ab2717a120121f
+_md5_=f3ae902ce925ec631449eef416ad94d9
diff --git a/metadata/md5-cache/dev-perl/Devel-Size-0.830.0 b/metadata/md5-cache/dev-perl/Devel-Size-0.830.0
index 9c4c4387e68c..33544cb39735 100644
--- a/metadata/md5-cache/dev-perl/Devel-Size-0.830.0
+++ b/metadata/md5-cache/dev-perl/Devel-Size-0.830.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for finding the memory usage of Perl variables
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Devel-Size
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.83.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5b40000f5b396d62dbcf9dbe50ff433d
+_md5_=a7dcb49402d7840d01c9ec2572101a72
diff --git a/metadata/md5-cache/dev-perl/FFI-CheckLib-0.270.0 b/metadata/md5-cache/dev-perl/FFI-CheckLib-0.270.0
index cc4c00cfe8cb..1ff5c4c65c2c 100644
--- a/metadata/md5-cache/dev-perl/FFI-CheckLib-0.270.0
+++ b/metadata/md5-cache/dev-perl/FFI-CheckLib-0.270.0
@@ -5,11 +5,11 @@ DESCRIPTION=Check that a library is available for FFI
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/FFI-CheckLib
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=05eea3737aadd42e3fc8443dc140a80a
+_md5_=9c29a8670b042e68c53ade424b0c5fd5
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0 b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0
index c408429bca08..ede289d63a44 100644
--- a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0
+++ b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0
@@ -5,11 +5,11 @@ DESCRIPTION=uses File::Copy to recursively copy dirs
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Copy-Recursive
 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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.45.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b523fbcc6d55181c8b144109f7b4efb8
+_md5_=6389f6fcf006bf65f43356ecfa710163
diff --git a/metadata/md5-cache/dev-perl/File-chdir-0.101.100 b/metadata/md5-cache/dev-perl/File-chdir-0.101.100
index 1ae891c8a8fc..0c8e09e9c6cf 100644
--- a/metadata/md5-cache/dev-perl/File-chdir-0.101.100
+++ b/metadata/md5-cache/dev-perl/File-chdir-0.101.100
@@ -4,11 +4,11 @@ DESCRIPTION=An alternative to File::Spec and CWD
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/File-chdir
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Spec-3.27 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c40969cc95cb809c9554331fe443607e
+_md5_=f1fbc286a05ea423e309ccfb3fb2431c
diff --git a/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0 b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
index 3a2c9118c266..5b21947522b0 100644
--- a/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
+++ b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lexically scoped subroutine wrappers
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Hook-LexWrap
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Hook-LexWrap-0.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=61e3258457c9ebcd18c038f9b8a02c83
+_md5_=c613cd84d3bdba94e7a500f8d0c7e477
diff --git a/metadata/md5-cache/dev-perl/Import-Into-1.2.5 b/metadata/md5-cache/dev-perl/Import-Into-1.2.5
index 323b4360349b..2c20a6fa1151 100644
--- a/metadata/md5-cache/dev-perl/Import-Into-1.2.5
+++ b/metadata/md5-cache/dev-perl/Import-Into-1.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=Import packages into other packages
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Import-Into
 IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ~riscv x86 ~ppc-aix ~x86-solaris
+KEYWORDS=amd64 ~arm ~ppc ~riscv x86 ~ppc-aix ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Module-Runtime dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Import-Into-1.002005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3f74b1e3c986ff22b8ada48de7eb8c6b
+_md5_=dceace6b5b17208bd7c7141044b57d59
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index b568b92925c5..961545362da8 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Pod-Markdown-Github-0.40.0 b/metadata/md5-cache/dev-perl/Pod-Markdown-Github-0.40.0
index 587ecfb4af40..1ba258e7e034 100644
--- a/metadata/md5-cache/dev-perl/Pod-Markdown-Github-0.40.0
+++ b/metadata/md5-cache/dev-perl/Pod-Markdown-Github-0.40.0
@@ -5,11 +5,11 @@ DESCRIPTION=Convert POD to Github's specific markdown
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Pod-Markdown-Github
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Getopt-Long dev-perl/Pod-Markdown virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6e726eb7c56656e42784f05650046ac0
+_md5_=f74c79c5a93c521e9ea0777fd13828fa
diff --git a/metadata/md5-cache/dev-perl/Pod-Readme-1.2.3 b/metadata/md5-cache/dev-perl/Pod-Readme-1.2.3
index 28424b9b1063..9c9032e62e2d 100644
--- a/metadata/md5-cache/dev-perl/Pod-Readme-1.2.3
+++ b/metadata/md5-cache/dev-perl/Pod-Readme-1.2.3
@@ -5,11 +5,11 @@ DESCRIPTION=Intelligently generate a README file from POD
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Pod-Readme
 IUSE=minimal test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Pod-Markdown dev-perl/Pod-Markdown-Github dev-perl/Pod-Simple-LaTeX dev-perl/Type-Tiny-XS virtual/perl-podlators ) >=dev-perl/CPAN-Changes-0.300.0 virtual/perl-CPAN-Meta dev-perl/Class-Method-Modifiers dev-perl/File-Slurp dev-perl/Getopt-Long-Descriptive virtual/perl-Module-CoreList dev-perl/Moo dev-perl/MooX-HandlesVia dev-perl/Path-Tiny virtual/perl-Pod-Simple dev-perl/Role-Tiny >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Try-Tiny >=dev-perl/Type-Tiny-1.0.0 dev-perl/namespace-autoclean dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRWO/Pod-Readme-v1.2.3.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=048982a544b9d878cbe193384178b9bc
+_md5_=b606258196e612e9b0838932d9fc7825
diff --git a/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0 b/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
index 112fba9c9703..3a08d78ef7f4 100644
--- a/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
+++ b/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
@@ -4,11 +4,11 @@ DESCRIPTION=Portably generate config for any shell
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Shell-Config-Generate
 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 ~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.33.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7052f1305bc75350707e5a5ba8cd6887
+_md5_=55e5db9faf3b689c0be67dd1c01fb3de
diff --git a/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0 b/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0
index 6c5ce30d0ab3..84af7d2c39fe 100644
--- a/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0
+++ b/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0
@@ -4,11 +4,11 @@ DESCRIPTION=Make an educated guess about the shell in use
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Shell-Guess
 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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Guess-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9a9dc38444625a31fc7e04db30b502c4
+_md5_=e46b9d997b86f0b729016483e9408a45
diff --git a/metadata/md5-cache/dev-perl/Sort-Versions-1.620.0 b/metadata/md5-cache/dev-perl/Sort-Versions-1.620.0
index cd6746870a8d..b5347f54f7da 100644
--- a/metadata/md5-cache/dev-perl/Sort-Versions-1.620.0
+++ b/metadata/md5-cache/dev-perl/Sort-Versions-1.620.0
@@ -4,11 +4,11 @@ DESCRIPTION=A perl 5 module for sorting of revision-like numbers
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Sort-Versions
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x86-solaris
 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/Sort-Versions-1.62.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=97b3bed94e573f73cde2e66d0f243953
+_md5_=b67a2082a04eb477119a42d1d28361cc
diff --git a/metadata/md5-cache/dev-perl/Sub-Delete-1.0.20 b/metadata/md5-cache/dev-perl/Sub-Delete-1.0.20
index a001aac832d2..de400ac25aca 100644
--- a/metadata/md5-cache/dev-perl/Sub-Delete-1.0.20
+++ b/metadata/md5-cache/dev-perl/Sub-Delete-1.0.20
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Perl module enabling one to delete subroutines
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Sub-Delete
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~riscv ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SP/SPROUT/Sub-Delete-1.00002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0efb6e7488bc9f08e908508c1d8d3aaf
+_md5_=d99b4ec05b5a78dd3c5bd2fed1bb81cf
diff --git a/metadata/md5-cache/dev-perl/Test-File-1.443.0 b/metadata/md5-cache/dev-perl/Test-File-1.443.0
index 5cb8749d39da..d92734aa9587 100644
--- a/metadata/md5-cache/dev-perl/Test-File-1.443.0
+++ b/metadata/md5-cache/dev-perl/Test-File-1.443.0
@@ -4,11 +4,11 @@ DESCRIPTION=Test file attributes
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Test-File
 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 ~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.443.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4f23acd0c3393d5b3d7e9f0b7bfd01a6
+_md5_=62113be89cddf5308ad89e502e2e05c3
diff --git a/metadata/md5-cache/dev-perl/Test-Kit-2.150.0 b/metadata/md5-cache/dev-perl/Test-Kit-2.150.0
index 2c1a4c285755..ef9a12073eea 100644
--- a/metadata/md5-cache/dev-perl/Test-Kit-2.150.0
+++ b/metadata/md5-cache/dev-perl/Test-Kit-2.150.0
@@ -5,11 +5,11 @@ DESCRIPTION=Build custom test packages with only the features you want
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Test-Kit
 IUSE=test
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~riscv ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-perl/Hook-LexWrap dev-perl/Import-Into dev-perl/Module-Runtime virtual/perl-Scalar-List-Utils dev-perl/Sub-Delete virtual/perl-Test-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAORU/Test-Kit-2.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fd01094020f426459c1721cd249ea210
+_md5_=68b7daac6627dc10a9455742e3ce93d0
diff --git a/metadata/md5-cache/dev-perl/Test-utf8-1.10.0 b/metadata/md5-cache/dev-perl/Test-utf8-1.10.0
index c6a0fbdf5394..fedda8c97a1a 100644
--- a/metadata/md5-cache/dev-perl/Test-utf8-1.10.0
+++ b/metadata/md5-cache/dev-perl/Test-utf8-1.10.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=Handy utf8 tests
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Test-utf8
-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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=beb3a653344a2f1991e89baebd795d65
+_md5_=bb2de1c2a8017ea26b170a445763c9c1
diff --git a/metadata/md5-cache/dev-perl/Time-Duration-1.200.0 b/metadata/md5-cache/dev-perl/Time-Duration-1.200.0
index c054f1742c5b..0b4a66b14495 100644
--- a/metadata/md5-cache/dev-perl/Time-Duration-1.200.0
+++ b/metadata/md5-cache/dev-perl/Time-Duration-1.200.0
@@ -4,11 +4,11 @@ DESCRIPTION=Rounded or exact English expression of durations
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Time-Duration
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux ~x64-macos
 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/Time-Duration-1.20.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fcf0ff1b6445f41297c330a21c490792
+_md5_=4a2e77e8120d2699dbe01144e73b5a99
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100 b/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
index 7b1d047318a2..2074f77ad288 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
@@ -4,11 +4,11 @@ DESCRIPTION=Perl binding for libxml2
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-LibXML
 IUSE=test minimal examples
-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 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 virtual/perl-IO virtual/perl-Scalar-List-Utils >=dev-perl/XML-SAX-0.120.0 >=dev-libs/libxml2-2.6.21:2= dev-perl/XML-SAX-Base >=dev-perl/XML-NamespaceSupport-1.70.0 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0201.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=84a885a29b95179e6873c7ec61d05515
+_md5_=9e270cad05a1e890638f77216663b618
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index cb657fa5a302..5ec4b7f5e5fd 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.14.2-r1 b/metadata/md5-cache/dev-python/PyQt5-5.14.2-r1
deleted file mode 100644
index f41e908b93f4..000000000000
--- a/metadata/md5-cache/dev-python/PyQt5-5.14.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.20:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 ) >=dev-python/sip-4.19.20[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dbus? ( virtual/pkgconfig )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
-IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network networkauth opengl positioning printsupport sensors serialport sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.20:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 )
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) networkauth? ( network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.14.2.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=72aea5a3737914363fa37469db756052
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.15.0-r1 b/metadata/md5-cache/dev-python/PyQt5-5.15.0-r1
deleted file mode 100644
index b21fe47bbbfb..000000000000
--- a/metadata/md5-cache/dev-python/PyQt5-5.15.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.23:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 ) >=dev-python/sip-4.19.23[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dbus? ( virtual/pkgconfig )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
-IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network networkauth opengl positioning printsupport sensors serialport sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.23:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 )
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) networkauth? ( network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.15.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a681c4badb519cc4dc225395b85a53f4
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.15.1 b/metadata/md5-cache/dev-python/PyQt5-5.15.1
index a5a8ed14188b..4fb973871c46 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.15.1
+++ b/metadata/md5-cache/dev-python/PyQt5-5.15.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
 IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network networkauth opengl positioning printsupport sensors serialport sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.23:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.14:5 >=dev-qt/qtxml-5.14:5 bluetooth? ( >=dev-qt/qtbluetooth-5.14:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.14:5 ) declarative? ( >=dev-qt/qtdeclarative-5.14:5[widgets?] ) designer? ( >=dev-qt/designer-5.14:5 ) gui? ( >=dev-qt/qtgui-5.14:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.14:5 ) location? ( >=dev-qt/qtlocation-5.14:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.14:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.14:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.14:5 ) opengl? ( >=dev-qt/qtopengl-5.14:5 ) positioning? ( >=dev-qt/qtpositioning-5.14:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.14:5 ) sensors? ( >=dev-qt/qtsensors-5.14:5 ) serialport? ( >=dev-qt/qtserialport-5.14:5 ) sql? ( >=dev-qt/qtsql-5.14:5 ) svg? ( >=dev-qt/qtsvg-5.14:5 ) testlib? ( >=dev-qt/qttest-5.14:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.14:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.14:5 ) widgets? ( >=dev-qt/qtwidgets-5.14:5 ) x11extras? ( >=dev-qt/qtx11extras-5.14:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.14:5 )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) networkauth? ( network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.15.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4dc787b5e0c3b4deeba67d188c68fcd2
+_md5_=c5c41f9b7003e8f3243a933737215fc1
diff --git a/metadata/md5-cache/dev-python/PyQt5-sip-4.19.22-r1 b/metadata/md5-cache/dev-python/PyQt5-sip-4.19.22-r1
deleted file mode 100644
index 2e30f7d9d5cc..000000000000
--- a/metadata/md5-cache/dev-python/PyQt5-sip-4.19.22-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Private sip module for PyQt5
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-python/PyQt5-5.12.2
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/12
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.22/sip-4.19.22.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e2c3a1ffe29cbc0396d3bede78ee42f4
diff --git a/metadata/md5-cache/dev-python/PyQt5-sip-4.19.23-r1 b/metadata/md5-cache/dev-python/PyQt5-sip-4.19.23-r1
deleted file mode 100644
index a18f0ba54059..000000000000
--- a/metadata/md5-cache/dev-python/PyQt5-sip-4.19.23-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Private sip module for PyQt5
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-python/PyQt5-5.12.2
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/12
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.23/sip-4.19.23.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8004c7f1339f7cc7e8ec5bab74aee105
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.14.0 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.14.0
deleted file mode 100644
index 3cbd1060adfb..000000000000
--- a/metadata/md5-cache/dev-python/PyQtWebEngine-5.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets] ~dev-python/sip-4.19.22[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Python bindings for QtWebEngine
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/intro
-IUSE=debug python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyQtWebEngine/PyQtWebEngine-5.14.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=23dc4e53f9de2a51bada945e4dca3d0f
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1
index cda923387e8a..75f0ee51cf95 100644
--- a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1
+++ b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for QtWebEngine
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/intro
 IUSE=debug python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQtWebEngine/PyQtWebEngine-5.15.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=066b5611d8ff38167abedef59827beef
+_md5_=2e1b22760ef192db920d77713f56ce41
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1_pre2006110847 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1_pre2006110847
deleted file mode 100644
index 1d48b8b27c46..000000000000
--- a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1_pre2006110847
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets] >=dev-python/sip-4.19.22[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Python bindings for QtWebEngine
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/intro
-IUSE=debug python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~pesa/distfiles/PyQtWebEngine-5.15.1.dev2006110847.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=49aa30ecdd829055fb1fb47b000cc2c3
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.7.1-r1 b/metadata/md5-cache/dev-python/aiohttp-3.7.1-r1
index a662ac8e77ab..13dde8993e39 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.7.1-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-3.7.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=http client/server for asyncio
 EAPI=7
 HOMEPAGE=https://pypi.org/project/aiohttp/
 IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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=Apache-2.0
 RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/attrs-17.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/multidict-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/yarl-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/idna-ssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/typing-extensions[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.7.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=25bff96b06827ea6ec5f8585dc184a58
+_md5_=82ac1f94c2954ab3c91e2fe5c26c259c
diff --git a/metadata/md5-cache/dev-python/async_generator-1.10 b/metadata/md5-cache/dev-python/async_generator-1.10
index fee7d870e6ac..714fe8f82af7 100644
--- a/metadata/md5-cache/dev-python/async_generator-1.10
+++ b/metadata/md5-cache/dev-python/async_generator-1.10
@@ -4,11 +4,11 @@ DESCRIPTION=Making it easy to write async iterators in Python 3.5
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/async_generator https://pypi.org/project/async_generator/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_generator/async_generator-1.10.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b10e2fa63731b9b0b3bb764e11bd921e
+_md5_=a3d31e5d261cc8f907cce24da6769608
diff --git a/metadata/md5-cache/dev-python/async_timeout-3.0.1 b/metadata/md5-cache/dev-python/async_timeout-3.0.1
index ca3302cd58ad..bc839cd82fd3 100644
--- a/metadata/md5-cache/dev-python/async_timeout-3.0.1
+++ b/metadata/md5-cache/dev-python/async_timeout-3.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Timeout context manager for asyncio programs
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/async-timeout
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-3.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3c953fd2522766a7fe6e15d1a871c1b0
+_md5_=1eba73522f760e2c8b9d9b45975ae1e8
diff --git a/metadata/md5-cache/dev-python/attrs-20.3.0 b/metadata/md5-cache/dev-python/attrs-20.3.0
index 8b177b8c6c1e..143d572e61e9 100644
--- a/metadata/md5-cache/dev-python/attrs-20.3.0
+++ b/metadata/md5-cache/dev-python/attrs-20.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Attributes without boilerplate
 EAPI=7
 HOMEPAGE=https://github.com/python-attrs/attrs https://attrs.readthedocs.org/ https://pypi.org/project/attrs/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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 ~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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-20.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=acb0a8246445cf8eacbe53858be8983b
+_md5_=cc33caed4224daccac2d6a7222af20d4
diff --git a/metadata/md5-cache/dev-python/automat-20.2.0 b/metadata/md5-cache/dev-python/automat-20.2.0
index 91b0a74f1532..cccd0b9c2f61 100644
--- a/metadata/md5-cache/dev-python/automat-20.2.0
+++ b/metadata/md5-cache/dev-python/automat-20.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Self-service finite-state machines for the programmer on the go
 EAPI=7
 HOMEPAGE=https://github.com/glyph/automat https://pypi.org/project/Automat/
 IUSE=examples test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-20.2.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1848b8b2f9879f31828035a11cc69e76
+_md5_=af86162c73de52ac7f29b1e861673fce
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.9.3 b/metadata/md5-cache/dev-python/beautifulsoup-4.9.3
index 4e84b927ce63..e80d2963df72 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.9.3
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.9.3
@@ -4,7 +4,7 @@ DESCRIPTION=Pythonic idioms for iterating, searching, and modifying an HTML/XML
 EAPI=7
 HOMEPAGE=https://www.crummy.com/software/BeautifulSoup/bs4/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.9.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8a77188fe00fe0e64966e946cdc9f221
+_md5_=c3975f651c7cb19243b560ac2a5b23e8
diff --git a/metadata/md5-cache/dev-python/betamax-0.8.1 b/metadata/md5-cache/dev-python/betamax-0.8.1
index 18601ae75a0c..c6d7ba1043df 100644
--- a/metadata/md5-cache/dev-python/betamax-0.8.1
+++ b/metadata/md5-cache/dev-python/betamax-0.8.1
@@ -5,7 +5,7 @@ DESCRIPTION=python-requests HTTP exchanges recorder
 EAPI=7
 HOMEPAGE=https://github.com/betamaxpy/betamax
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax/betamax-0.8.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a98c25be90588ba099ca955c6c8e507a
+_md5_=1feff285bc0dbd91bab06054c6716344
diff --git a/metadata/md5-cache/dev-python/black-20.8_beta1 b/metadata/md5-cache/dev-python/black-20.8_beta1
index 9b597283d3a6..4a403cbae528 100644
--- a/metadata/md5-cache/dev-python/black-20.8_beta1
+++ b/metadata/md5-cache/dev-python/black-20.8_beta1
@@ -4,7 +4,7 @@ DESCRIPTION=The uncompromising Python code formatter
 EAPI=7
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
 IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/click-7.1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toml-0.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/typed-ast[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/typing-extensions-3.7.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/dataclasses[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/20.8b1.tar.gz -> black-20.8b1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=92f05cc4c1ac0f1e881f994af7a590f1
+_md5_=eaf26fe4865348c677b7b5a75b1f378c
diff --git a/metadata/md5-cache/dev-python/bleach-3.2.1 b/metadata/md5-cache/dev-python/bleach-3.2.1
index e1534ab23a50..37dc5c6fb5a1 100644
--- a/metadata/md5-cache/dev-python/bleach-3.2.1
+++ b/metadata/md5-cache/dev-python/bleach-3.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=an easy whitelist-based HTML-sanitizing tool
 EAPI=7
 HOMEPAGE=https://github.com/mozilla/bleach https://pypi.org/project/bleach/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-3.2.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=be0052f7060ed4b7aa75df2defe7a9a0
+_md5_=c241006c97e1c85c441d68c1ec5c88dd
diff --git a/metadata/md5-cache/dev-python/blessed-1.17.12 b/metadata/md5-cache/dev-python/blessed-1.17.12
new file mode 100644
index 000000000000..979edfa7de0d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/blessed-1.17.12
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_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_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d6ca03c39aa213731dd09bbed8fd6552
diff --git a/metadata/md5-cache/dev-python/blinker-1.4-r2 b/metadata/md5-cache/dev-python/blinker-1.4-r2
index 09556c033d18..4cc57016f79c 100644
--- a/metadata/md5-cache/dev-python/blinker-1.4-r2
+++ b/metadata/md5-cache/dev-python/blinker-1.4-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Fast, simple object-to-object and broadcast signaling
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/blinker/ https://pypi.org/project/blinker/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blinker/blinker-1.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4375baec1c87c9b2149683abd9a06189
+_md5_=43d3182ee151a7819bdfb00fc5f977f2
diff --git a/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3 b/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
index 777b9722d69f..dfadbe0087ac 100644
--- a/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
+++ b/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Python binding to the Brotli library
 EAPI=6
 HOMEPAGE=https://github.com/python-hyper/brotlipy/ https://pypi.python.org/pypi/brotlipy
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !app-arch/brotli[python] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/brotlipy/archive/v0.7.0.tar.gz -> brotlipy-0.7.0.tar.gz https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a0b2363a8a90fdf93eea5ebc70bfd8a
+_md5_=fbc29de6e0f12400240064145c48bdad
diff --git a/metadata/md5-cache/dev-python/castellan-3.6.0 b/metadata/md5-cache/dev-python/castellan-3.6.0
index f91b90c66495..d1bc73a57e15 100644
--- a/metadata/md5-cache/dev-python/castellan-3.6.0
+++ b/metadata/md5-cache/dev-python/castellan-3.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Generic Key Manager interface for OpenStack
 EAPI=7
 HOMEPAGE=https://pypi.org/project/castellan/
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-6.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/requests-2.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/castellan/castellan-3.6.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8669ab8fea811d1df610edfca6b93017
+_md5_=53e4d572a23c32ecc414188447d624f4
diff --git a/metadata/md5-cache/dev-python/cffi-1.14.0-r3 b/metadata/md5-cache/dev-python/cffi-1.14.0-r3
index 802953291a02..bfb1eeaeffb1 100644
--- a/metadata/md5-cache/dev-python/cffi-1.14.0-r3
+++ b/metadata/md5-cache/dev-python/cffi-1.14.0-r3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.14.0
 SRC_URI=mirror://pypi/c/cffi/cffi-1.14.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=748128495bea23728f85b1588271a5f0
+_md5_=cd4eb2f1649bf3612020b87046131c68
diff --git a/metadata/md5-cache/dev-python/characteristic-14.3.0-r3 b/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
index d9f8e1d0e7e4..0f0c498331e3 100644
--- a/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
+++ b/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Python attributes without the boilerplate
 EAPI=7
 HOMEPAGE=https://characteristic.readthedocs.org/ https://github.com/hynek/characteristic
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/characteristic/characteristic-14.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=abbcf07f36560508f9b75faf9352e4ba
+_md5_=60ac286fc6daf578963c140298b72f81
diff --git a/metadata/md5-cache/dev-python/clang-python-10.0.0 b/metadata/md5-cache/dev-python/clang-python-10.0.0
deleted file mode 100644
index 28ff7a94b4a9..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-10.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install test unpack
-DEPEND=>=sys-devel/clang-10.0.0:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-10.0.0:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aeaa827f55679dbe4e3acf0d232e83cc
diff --git a/metadata/md5-cache/dev-python/clang-python-11.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-11.0.0.9999
index c25f1e2ce98c..fabc0d4e6eed 100644
--- a/metadata/md5-cache/dev-python/clang-python-11.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-11.0.0.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c4b76662cc5a9e0f4d6feffcbb2eade4
+_md5_=61feec4f497091aae60bf4d12c504011
diff --git a/metadata/md5-cache/dev-python/clang-python-12.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-12.0.0.9999
index d0f69adc4882..cc293d6cb4e6 100644
--- a/metadata/md5-cache/dev-python/clang-python-12.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-12.0.0.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c4b76662cc5a9e0f4d6feffcbb2eade4
+_md5_=61feec4f497091aae60bf4d12c504011
diff --git a/metadata/md5-cache/dev-python/click-7.1.2-r1 b/metadata/md5-cache/dev-python/click-7.1.2-r1
index 6d90edd9aa8b..b3f1fc67f15d 100644
--- a/metadata/md5-cache/dev-python/click-7.1.2-r1
+++ b/metadata/md5-cache/dev-python/click-7.1.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A Python package for creating beautiful command line interfaces
 EAPI=7
 HOMEPAGE=https://palletsprojects.com/p/click/ https://pypi.org/project/click/
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/click/archive/7.1.2.tar.gz -> click-7.1.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=97770857b2e22dfdedee14069dc24e78
+_md5_=8cd90c92145919aeccdf1093ed2cfcc5
diff --git a/metadata/md5-cache/dev-python/constantly-15.1.0-r1 b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
index 2dc231d5f006..7c14cf7364be 100644
--- a/metadata/md5-cache/dev-python/constantly-15.1.0-r1
+++ b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Symbolic constants in Python
 EAPI=7
 HOMEPAGE=https://github.com/twisted/constantly https://pypi.org/project/constantly/
 IUSE=test python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/constantly/archive/15.1.0.tar.gz -> constantly-15.1.0.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=78514db6c6f85c52a7f69f35759377d3
+_md5_=80bf96b699297ade48e27d5246a30954
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1 b/metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1
index c95d976af9dc..c4866632e5ef 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1
+++ b/metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Backports and enhancements for the contextlib module
 EAPI=7
 HOMEPAGE=https://pypi.org/project/contextlib2/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=PSF-2.4
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.6.0.post1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c0b225acffc78fca7fffe9868ceb152a
+_md5_=317935a3fc105029254b3ad661ec5c80
diff --git a/metadata/md5-cache/dev-python/coverage-5.3 b/metadata/md5-cache/dev-python/coverage-5.3
index cce2b333d841..240cf60fd39c 100644
--- a/metadata/md5-cache/dev-python/coverage-5.3
+++ b/metadata/md5-cache/dev-python/coverage-5.3
@@ -4,7 +4,7 @@ DESCRIPTION=Code coverage measurement for Python
 EAPI=7
 HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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_6? ( dev-lang/python:3.6[threads(+),sqlite(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-5.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=62b92ae6dc1069011804e54621367964
+_md5_=a525dbfbd51b1470f0bfbd1a2fb4200b
diff --git a/metadata/md5-cache/dev-python/cssselect-1.1.0-r1 b/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
index 446f4f44768b..f518465e0cfb 100644
--- a/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
 EAPI=7
 HOMEPAGE=https://cssselect.readthedocs.io/en/latest/ https://pypi.org/project/cssselect/ https://github.com/scrapy/cssselect
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scrapy/cssselect/archive/v1.1.0.tar.gz -> cssselect-1.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dd2027bced08c37b6b7272cce87104b7
+_md5_=948f25b2a7baac7aec36163eb1fc538b
diff --git a/metadata/md5-cache/dev-python/csv23-0.3.2-r1 b/metadata/md5-cache/dev-python/csv23-0.3.2-r1
index 0279296341e3..6a60576ada5a 100644
--- a/metadata/md5-cache/dev-python/csv23-0.3.2-r1
+++ b/metadata/md5-cache/dev-python/csv23-0.3.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python 2/3 unicode CSV compatibility layer
 EAPI=7
 HOMEPAGE=https://pypi.org/project/csv23/ https://github.com/xflr6/csv23/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
+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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xflr6/csv23/archive/v0.3.2.tar.gz -> csv23-0.3.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0e9e8af595e9b1bdafb27763aab883ec
+_md5_=bf21d8d38b1562799e34e992a8899ab2
diff --git a/metadata/md5-cache/dev-python/distlib-0.3.1-r1 b/metadata/md5-cache/dev-python/distlib-0.3.1-r1
index 6b4c1ee5023f..b5c21251eef8 100644
--- a/metadata/md5-cache/dev-python/distlib-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/distlib-0.3.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level components of distutils2/packaging
 EAPI=7
 HOMEPAGE=https://pypi.org/project/distlib/ https://bitbucket.org/pypa/distlib/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/pypa/distlib/get/0.3.1.tar.bz2 -> distlib-0.3.1.tar.bz2
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=b45ffc33e5d312fc82ceb6ae848f29a8
+_md5_=5b89c2eafa1d7181f437071dcec0c2ec
diff --git a/metadata/md5-cache/dev-python/elementpath-2.0.4 b/metadata/md5-cache/dev-python/elementpath-2.0.4
index 86896b6e49d1..c7e555e8667f 100644
--- a/metadata/md5-cache/dev-python/elementpath-2.0.4
+++ b/metadata/md5-cache/dev-python/elementpath-2.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=XPath 1.0/2.0 parsers and selectors for ElementTree and lxml
 EAPI=7
 HOMEPAGE=https://github.com/sissaschool/elementpath https://pypi.org/project/elementpath/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/elementpath/elementpath-2.0.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=764bc1ac246bdf8b14798ec737b9939c
+_md5_=83602abc9c5d00a0602d36ff1beb3d62
diff --git a/metadata/md5-cache/dev-python/entrypoints-0.3-r2 b/metadata/md5-cache/dev-python/entrypoints-0.3-r2
index 6b5f647e3aae..f2dfd30df1f9 100644
--- a/metadata/md5-cache/dev-python/entrypoints-0.3-r2
+++ b/metadata/md5-cache/dev-python/entrypoints-0.3-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Discover and load entry points from installed packages
 EAPI=7
 HOMEPAGE=https://github.com/takluyver/entrypoints
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/entrypoints/entrypoints-0.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=038626a418e3e2c2d3ef43ff99710b97
+_md5_=3e5cea0e878c084c64454eb70a4aeb29
diff --git a/metadata/md5-cache/dev-python/execnet-1.7.1-r1 b/metadata/md5-cache/dev-python/execnet-1.7.1-r1
index 125022d92f99..7e3fdf3642d5 100644
--- a/metadata/md5-cache/dev-python/execnet-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/execnet-1.7.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Rapid multi-Python deployment
 EAPI=7
 HOMEPAGE=https://codespeak.net/execnet/ https://pypi.org/project/execnet/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/apipkg-1.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/execnet/execnet-1.7.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4a05bb21de3d28fddafc2f3ef6f9831b
+_md5_=d8fe9610048a81ac32b45dcde400089b
diff --git a/metadata/md5-cache/dev-python/fields-5.0.0-r2 b/metadata/md5-cache/dev-python/fields-5.0.0-r2
index 3f5e9325cb9f..e62d666038ce 100644
--- a/metadata/md5-cache/dev-python/fields-5.0.0-r2
+++ b/metadata/md5-cache/dev-python/fields-5.0.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Container class boilerplate killer
 EAPI=7
 HOMEPAGE=https://github.com/ionelmc/python-fields
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fields/fields-5.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9b8d167743c41b2c29d778c7b48d7720
+_md5_=1739c5f11bd62fc723fe7897021339cc
diff --git a/metadata/md5-cache/dev-python/filelock-3.0.12-r1 b/metadata/md5-cache/dev-python/filelock-3.0.12-r1
index d8506dabc66e..825eb1bfea21 100644
--- a/metadata/md5-cache/dev-python/filelock-3.0.12-r1
+++ b/metadata/md5-cache/dev-python/filelock-3.0.12-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A platform independent file lock for Python
 EAPI=7
 HOMEPAGE=https://github.com/benediktschmitt/py-filelock https://pypi.org/project/filelock/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=Unlicense
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/benediktschmitt/py-filelock/archive/v3.0.12.tar.gz -> py-filelock-3.0.12.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7905d1120f08e92b4e0a12b30e62a8c1
+_md5_=8500a700e6ec6c02d2953d0ac5667276
diff --git a/metadata/md5-cache/dev-python/flake8-3.8.3-r1 b/metadata/md5-cache/dev-python/flake8-3.8.3-r1
index 45f8b8065d59..7dcc0b276e4a 100644
--- a/metadata/md5-cache/dev-python/flake8-3.8.3-r1
+++ b/metadata/md5-cache/dev-python/flake8-3.8.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
 EAPI=7
 HOMEPAGE=https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.6.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/mccabe-0.7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 RDEPEND=>=dev-python/pyflakes-2.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyflakes-2.3.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycodestyle-2.6.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-3.8.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fc21de3e00f5b8123b70f014183330b8
+_md5_=f10d9a5364119083e71eaa89b7bcf4ed
diff --git a/metadata/md5-cache/dev-python/flaky-3.7.0-r1 b/metadata/md5-cache/dev-python/flaky-3.7.0-r1
index 676645153939..8cfc70b34a24 100644
--- a/metadata/md5-cache/dev-python/flaky-3.7.0-r1
+++ b/metadata/md5-cache/dev-python/flaky-3.7.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Plugin for nose or py.test that automatically reruns flaky tests
 EAPI=7
 HOMEPAGE=https://pypi.org/project/flaky/ https://github.com/box/flaky
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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 ~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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flaky/flaky-3.7.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5a0ce47bfc1af80942b0b119a79f0d9d
+_md5_=590ad37c0a2099b597b849ec9c3ae62e
diff --git a/metadata/md5-cache/dev-python/flask-1.1.2-r1 b/metadata/md5-cache/dev-python/flask-1.1.2-r1
index 6a9971ca8c05..550747c05172 100644
--- a/metadata/md5-cache/dev-python/flask-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/flask-1.1.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
 EAPI=7
 HOMEPAGE=https://github.com/pallets/flask/
 IUSE=examples test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-python/click[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/werkzeug-0.15[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask/Flask-1.1.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1891ba4c7bef447b45aaca393b57aff2
+_md5_=2ae5e05a627f2d2f47feac885511bcfe
diff --git a/metadata/md5-cache/dev-python/genty-1.3.2-r1 b/metadata/md5-cache/dev-python/genty-1.3.2-r1
index b9610fee1734..bf85f58a40d4 100644
--- a/metadata/md5-cache/dev-python/genty-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/genty-1.3.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Allows you to run a test with multiple data sets
 EAPI=7
 HOMEPAGE=https://pypi.org/project/genty/ https://github.com/box/genty
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/genty/genty-1.3.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7ed072cd2e07a7a493ec87969f7692bf
+_md5_=c6a179fa35845560b615457d78c95581
diff --git a/metadata/md5-cache/dev-python/gevent-20.9.0 b/metadata/md5-cache/dev-python/gevent-20.9.0
index 925ae42a0a68..2c612d15b792 100644
--- a/metadata/md5-cache/dev-python/gevent-20.9.0
+++ b/metadata/md5-cache/dev-python/gevent-20.9.0
@@ -5,7 +5,7 @@ DESCRIPTION=Coroutine-based network library
 EAPI=7
 HOMEPAGE=https://www.gevent.org/ https://pypi.org/project/gevent/
 IUSE=doc examples test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-libs/libev-4.23:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= >=dev-python/greenlet-0.4.17 dev-python/zope-event[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-20.9.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=803cf232610e814cea8dd0de8162dd71
+_md5_=c18594b14f70d8bf2697e7805bfb688c
diff --git a/metadata/md5-cache/dev-python/gmpy-2.0.8-r2 b/metadata/md5-cache/dev-python/gmpy-2.0.8-r2
index 9d871b2eface..d40c700b7882 100644
--- a/metadata/md5-cache/dev-python/gmpy-2.0.8-r2
+++ b/metadata/md5-cache/dev-python/gmpy-2.0.8-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for GMP, MPC, MPFR and MPIR libraries
 EAPI=7
 HOMEPAGE=https://github.com/aleaxit/gmpy
 IUSE=mpir doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/mpc-1.0.2:= >=dev-libs/mpfr-3.1.2:= !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=2
 SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.0.8.zip
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2f7f97d89127098578bd188c1e391b7a
+_md5_=594fd1c05216c99f0f84d3e3ef451a6f
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.17 b/metadata/md5-cache/dev-python/greenlet-0.4.17
index 99e6f94cbaa3..2dba42bef7e5 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.17
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.17
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight in-process concurrent programming
 EAPI=7
 HOMEPAGE=https://pypi.org/project/greenlet/
 IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.17.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d399e4f717ca7b75d099a0eada2e166d
+_md5_=cca0fd09f5109d174972c9139d299739
diff --git a/metadata/md5-cache/dev-python/httpbin-0.7.0-r1 b/metadata/md5-cache/dev-python/httpbin-0.7.0-r1
index 74e20725c10a..58e48a22e830 100644
--- a/metadata/md5-cache/dev-python/httpbin-0.7.0-r1
+++ b/metadata/md5-cache/dev-python/httpbin-0.7.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP Request and Response Service
 EAPI=7
 HOMEPAGE=https://github.com/postmanlabs/httpbin https://pypi.org/project/httpbin/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/brotlipy[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/werkzeug-0.14.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpbin/httpbin-0.7.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=67e6312c1aa50fb6e1d3fff7faf24588
+_md5_=ea6fc43ac0483f38b5827265bd2bd578
diff --git a/metadata/md5-cache/dev-python/hyperlink-20.0.1 b/metadata/md5-cache/dev-python/hyperlink-20.0.1
index d67422559b4b..ffd675181bca 100644
--- a/metadata/md5-cache/dev-python/hyperlink-20.0.1
+++ b/metadata/md5-cache/dev-python/hyperlink-20.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=A featureful, correct URL for Python
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/
 IUSE=test python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=dev-python/idna[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-20.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1af3b6bde15d39428adcfad01075bd2c
+_md5_=4315793e3a7710902efeef61728985e3
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.41.3 b/metadata/md5-cache/dev-python/hypothesis-5.41.3
index f0cc0b7f8368..c10993b20ad4 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.41.3
+++ b/metadata/md5-cache/dev-python/hypothesis-5.41.3
@@ -4,7 +4,7 @@ DESCRIPTION=A library for property based testing
 EAPI=7
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
 IUSE=cli test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.41.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0b50eac0541d2d7f03c5d2de99e3425b
+_md5_=cfee05718e71de734964203283068061
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.41.4 b/metadata/md5-cache/dev-python/hypothesis-5.41.4
new file mode 100644
index 000000000000..50950717862d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.41.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-5.3.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.41.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cfee05718e71de734964203283068061
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-3.1.0 b/metadata/md5-cache/dev-python/importlib_metadata-3.1.0
index e5145e84b818..0a7b5754a1a1 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-3.1.0
+++ b/metadata/md5-cache/dev-python/importlib_metadata-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Read metadata from Python packages
 EAPI=7
 HOMEPAGE=https://github.com/python/importlib_metadata
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-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 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-3.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=64a280c90b0d34f3ae9e9a63e45727ea
+_md5_=7257cc04ba27878a0a57a9474b14f528
diff --git a/metadata/md5-cache/dev-python/importlib_resources-3.3.0 b/metadata/md5-cache/dev-python/importlib_resources-3.3.0
index c316a130f3a9..6572ed330411 100644
--- a/metadata/md5-cache/dev-python/importlib_resources-3.3.0
+++ b/metadata/md5-cache/dev-python/importlib_resources-3.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Read resources from Python packages
 EAPI=7
 HOMEPAGE=https://github.com/python/importlib_resources
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-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 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( dev-python/zipp[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/zipp[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/zipp[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-3.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8810fccb200d85ad25bd132c2ac1a9eb
+_md5_=7294108c2ddf7adfa6ec5e8c719ca85e
diff --git a/metadata/md5-cache/dev-python/incremental-17.5.0 b/metadata/md5-cache/dev-python/incremental-17.5.0
index 3889d424fa77..77549c480ac0 100644
--- a/metadata/md5-cache/dev-python/incremental-17.5.0
+++ b/metadata/md5-cache/dev-python/incremental-17.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Incremental is a small library that versions your Python projects
 EAPI=7
 HOMEPAGE=https://github.com/twisted/incremental https://pypi.org/project/incremental/
 IUSE=python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/i/incremental/incremental-17.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bbbf769392f786e94b2b123c27ee7557
+_md5_=6f1e6caaf26701b0d4ec93a6ba0d0174
diff --git a/metadata/md5-cache/dev-python/inflect-5.0.2 b/metadata/md5-cache/dev-python/inflect-5.0.2
index 07164c908333..980e27d497db 100644
--- a/metadata/md5-cache/dev-python/inflect-5.0.2
+++ b/metadata/md5-cache/dev-python/inflect-5.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Correctly inflect words and numbers
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/inflect
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflect/inflect-5.0.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6c6d6876f05ebfc59bd34fb4854426fb
+_md5_=80e0be3282464b6b82883c58d6832aac
diff --git a/metadata/md5-cache/dev-python/iniconfig-1.0.0 b/metadata/md5-cache/dev-python/iniconfig-1.0.0
index 978aa23dee0c..91f42a7f3ad4 100644
--- a/metadata/md5-cache/dev-python/iniconfig-1.0.0
+++ b/metadata/md5-cache/dev-python/iniconfig-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Brain-dead simple config-ini parsing
 EAPI=7
 HOMEPAGE=https://github.com/RonnyPfannschmidt/iniconfig
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniconfig/iniconfig-1.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=800655e8c9f7cb43c05c3c4144a6fa41
+_md5_=d95b60aad919c0585e62387914b60aed
diff --git a/metadata/md5-cache/dev-python/isort-5.6.3 b/metadata/md5-cache/dev-python/isort-5.6.3
index fdc10fece13e..89ccbc72c48e 100644
--- a/metadata/md5-cache/dev-python/isort-5.6.3
+++ b/metadata/md5-cache/dev-python/isort-5.6.3
@@ -4,7 +4,7 @@ DESCRIPTION=A python utility/library to sort imports
 EAPI=7
 HOMEPAGE=https://pypi.org/project/isort/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~ia64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/isort/isort-5.6.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ccc2528ee51b8f26a3625ec0763e3a78
+_md5_=f4dfe4a29c0b565c7b18ec6945a9e1cd
diff --git a/metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1 b/metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
index 35f1cdd5d723..58287bc774a1 100644
--- a/metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Various helpers to pass trusted data to untrusted environments and b
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/itsdangerous/itsdangerous-1.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=57db01c78846519082e28e12057e3256
+_md5_=2d6e138857e4e67c33d3ec58f0f5e0e8
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-3.1.0 b/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
index e62ea54239ee..e50f868d6adf 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
+++ b/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=Classes used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.classes
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.classes/jaraco.classes-3.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4ee4c5e1ebb8d007f1a1bd511b3a8eaf
+_md5_=77cb63c66a171d91b82b29cfc229dac9
diff --git a/metadata/md5-cache/dev-python/jaraco-envs-2.0.0 b/metadata/md5-cache/dev-python/jaraco-envs-2.0.0
index b774338e8bdb..07f30623979b 100644
--- a/metadata/md5-cache/dev-python/jaraco-envs-2.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-envs-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Classes for orchestrating Python (virtual) environments.
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.envs
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/namespace-jaraco[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/contextlib2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/contextlib2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.envs/jaraco.envs-2.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0555882ab6f42ce08299e1b1efb1b91c
+_md5_=eb6228d56115dcb1408803be342905d3
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-3.0.1 b/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
index 7c0c974f40e8..3a382da7c7d2 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
+++ b/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Additional functions used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.functools
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-3.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=835c877babfb1aae0a31f51bda801f69
+_md5_=4d9da5157042a6c52ea9331dfc1db24b
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0 b/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
index 6a1db0fa890a..92e067c659e1 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for working with iterables. Complements itertools and more_ite
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.itertools
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/inflect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-5.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5ead2ff8975fe45a73915e2f9d7fea92
+_md5_=7d79e36d581d6b64cc0353ea067361d1
diff --git a/metadata/md5-cache/dev-python/jeepney-0.6.0 b/metadata/md5-cache/dev-python/jeepney-0.6.0
index 4df4368e4e20..70af94885b98 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.6.0
+++ b/metadata/md5-cache/dev-python/jeepney-0.6.0
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level, pure Python DBus protocol wrapper
 EAPI=7
 HOMEPAGE=https://gitlab.com/takluyver/jeepney
 IUSE=examples test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.6.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5434d3667467e1491d4442dc8c10ae16
+_md5_=cbd0fc831d394c971cfd5198e2a20b3c
diff --git a/metadata/md5-cache/dev-python/keyring-21.5.0 b/metadata/md5-cache/dev-python/keyring-21.5.0
index 0672ed82bc7e..1f7a34a1a960 100644
--- a/metadata/md5-cache/dev-python/keyring-21.5.0
+++ b/metadata/md5-cache/dev-python/keyring-21.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Provides access to the system keyring service
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/keyring
 IUSE=doc test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=PSF-2
 RDEPEND=dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaraco/keyring/archive/v21.5.0.tar.gz -> keyring-21.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ccd2722ca87a1c67efc66d433efc8570
+_md5_=9d89afa39a5d3bd6893dcbaefd7fba94
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-7.0.1 b/metadata/md5-cache/dev-python/keystonemiddleware-7.0.1
deleted file mode 100644
index b6492fe88f3c..000000000000
--- a/metadata/md5-cache/dev-python/keystonemiddleware-7.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
-DESCRIPTION=A middleware for the OpenStack Keystone API
-EAPI=7
-HOMEPAGE=https://github.com/openstack/keystonemiddleware
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/keystoneauth-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycadf-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pycadf-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-7.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f45b34ab901d25a61345fc512d3396c4
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-9.1.0 b/metadata/md5-cache/dev-python/keystonemiddleware-9.1.0
index 676aa6a870f5..08f6afe67060 100644
--- a/metadata/md5-cache/dev-python/keystonemiddleware-9.1.0
+++ b/metadata/md5-cache/dev-python/keystonemiddleware-9.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=A middleware for the OpenStack Keystone API
 EAPI=7
 HOMEPAGE=https://github.com/openstack/keystonemiddleware
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pycadf-1.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pycadf-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-keystoneclient-3.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-9.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a886755a29032263ea0741c77005df01
+_md5_=08d2354926615af48154bbb3a8d831e6
diff --git a/metadata/md5-cache/dev-python/lit-10.0.0 b/metadata/md5-cache/dev-python/lit-10.0.0
deleted file mode 100644
index 8bd489fda03e..000000000000
--- a/metadata/md5-cache/dev-python/lit-10.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-devel/llvm ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A stand-alone install of the LLVM suite testing tool
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm arm64 ppc64 x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=33bb9bbcc9a2069662a31cfa704fab0e
diff --git a/metadata/md5-cache/dev-python/lit-11.0.0.9999 b/metadata/md5-cache/dev-python/lit-11.0.0.9999
index be1b6d60882c..2e61963476cc 100644
--- a/metadata/md5-cache/dev-python/lit-11.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-11.0.0.9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=95c6c42106d8f76add19500f1a394c09
+_md5_=b60d0945034a1736ab6ba38655095a4c
diff --git a/metadata/md5-cache/dev-python/lit-12.0.0.9999 b/metadata/md5-cache/dev-python/lit-12.0.0.9999
index be1b6d60882c..2e61963476cc 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-12.0.0.9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=95c6c42106d8f76add19500f1a394c09
+_md5_=b60d0945034a1736ab6ba38655095a4c
diff --git a/metadata/md5-cache/dev-python/lxml-4.6.2 b/metadata/md5-cache/dev-python/lxml-4.6.2
index 6ac3f88e4f75..ca6bdb58838a 100644
--- a/metadata/md5-cache/dev-python/lxml-4.6.2
+++ b/metadata/md5-cache/dev-python/lxml-4.6.2
@@ -5,7 +5,7 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=7
 HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
 IUSE=doc examples +threads test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.6.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=75f5822e4defc9490a0b029599c271da
+_md5_=41e888aa3d63b7ecc20051a9afb7ec76
diff --git a/metadata/md5-cache/dev-python/m2r-0.2.1 b/metadata/md5-cache/dev-python/m2r-0.2.1
index b6bab74f7629..7365d28b8023 100644
--- a/metadata/md5-cache/dev-python/m2r-0.2.1
+++ b/metadata/md5-cache/dev-python/m2r-0.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Markdown to reStructuredText converter
 EAPI=7
 HOMEPAGE=https://github.com/miyakogi/m2r https://pypi.org/project/m2r/
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/mistune-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miyakogi/m2r/archive/v0.2.1.tar.gz -> m2r-0.2.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=32ab33bd29c06c02836e9d826c05ca0d
+_md5_=226c9fdeebaa2ab0d7c5cb6dce8d6f35
diff --git a/metadata/md5-cache/dev-python/mistune-0.8.4-r1 b/metadata/md5-cache/dev-python/mistune-0.8.4-r1
index aaa65fde9923..28a18af79846 100644
--- a/metadata/md5-cache/dev-python/mistune-0.8.4-r1
+++ b/metadata/md5-cache/dev-python/mistune-0.8.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The fastest markdown parser in pure Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/mistune/ https://github.com/lepture/mistune
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mistune/mistune-0.8.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2af0bb84d7fcb95732242156e30da28e
+_md5_=46f08130b0ee5f1641b686a52da318f7
diff --git a/metadata/md5-cache/dev-python/monotonic-1.5-r1 b/metadata/md5-cache/dev-python/monotonic-1.5-r1
index 15f3d4f03c3b..ec79ea92f4e7 100644
--- a/metadata/md5-cache/dev-python/monotonic-1.5-r1
+++ b/metadata/md5-cache/dev-python/monotonic-1.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of time.monotonic() for Python 2 & < 3.3
 EAPI=7
 HOMEPAGE=https://github.com/atdt/monotonic
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/monotonic/monotonic-1.5.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cb8f26fab47003628ce9077dafd486c7
+_md5_=e2ba570e187413be322cda58f86622e8
diff --git a/metadata/md5-cache/dev-python/more-itertools-5.0.0-r1 b/metadata/md5-cache/dev-python/more-itertools-5.0.0-r1
deleted file mode 100644
index ed4c996c75a2..000000000000
--- a/metadata/md5-cache/dev-python/more-itertools-5.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( <dev-python/six-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-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_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=<dev-python/six-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/more-itertools/more-itertools-5.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ba98cdb50ea6fc027246370445be9509
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.6.0 b/metadata/md5-cache/dev-python/more-itertools-8.6.0
index 6bef13fd2c62..0f229192474c 100644
--- a/metadata/md5-cache/dev-python/more-itertools-8.6.0
+++ b/metadata/md5-cache/dev-python/more-itertools-8.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=More routines for operating on iterables, beyond itertools
 EAPI=7
 HOMEPAGE=https://pypi.org/project/more-itertools/
 IUSE=doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.6.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d3528dd3a941a1b531edff74d2edf912
+_md5_=4d10470518ce8e5baca0f8734159445b
diff --git a/metadata/md5-cache/dev-python/multidict-5.0.0 b/metadata/md5-cache/dev-python/multidict-5.0.0
index 24f2d3747068..3e75ec893c19 100644
--- a/metadata/md5-cache/dev-python/multidict-5.0.0
+++ b/metadata/md5-cache/dev-python/multidict-5.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=multidict implementation
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/multidict/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v5.0.0.tar.gz -> multidict-5.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=58dca960a29f18fbb02a674bf533f252
+_md5_=8c0380d687153842fc92ec79b92a3c6a
diff --git a/metadata/md5-cache/dev-python/munch-2.5.0-r1 b/metadata/md5-cache/dev-python/munch-2.5.0-r1
index 509199d63b90..f77746a17e3d 100644
--- a/metadata/md5-cache/dev-python/munch-2.5.0-r1
+++ b/metadata/md5-cache/dev-python/munch-2.5.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A dot-accessible dictionary (a la JavaScript objects)
 EAPI=7
 HOMEPAGE=https://github.com/Infinidat/munch
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-2.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=153543592385349d9011fe495a716c82
+_md5_=67b67ecd84b5bbcd062e1ccc327a8652
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1 b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
index 887676b4cb9e..4b3fb46c5371 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Optional static typing for Python
 EAPI=7
 HOMEPAGE=http://www.mypy-lang.org/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy_extensions/archive/0.4.3.tar.gz -> mypy_extensions-0.4.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0c02c030d545206a8f4b7a64a8cc3530
+_md5_=5cffa33f3ffd5d6c55bd4dc049e49c20
diff --git a/metadata/md5-cache/dev-python/namespace-jaraco-2-r2 b/metadata/md5-cache/dev-python/namespace-jaraco-2-r2
index c4664e8f614c..d8f3707e9a35 100644
--- a/metadata/md5-cache/dev-python/namespace-jaraco-2-r2
+++ b/metadata/md5-cache/dev-python/namespace-jaraco-2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Namespace package declaration for jaraco
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=public-domain
 RDEPEND=!<dev-python/jaraco-packaging-5.1 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0bd999f0c4ce8556d90a8da72a294363
+_md5_=1b2b29bd4719414f37a583fab4e36ec5
diff --git a/metadata/md5-cache/dev-python/namespace-paste-1-r1 b/metadata/md5-cache/dev-python/namespace-paste-1-r1
index 0779dfef4ae6..ead7494b94b5 100644
--- a/metadata/md5-cache/dev-python/namespace-paste-1-r1
+++ b/metadata/md5-cache/dev-python/namespace-paste-1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Namespace package declaration for paste
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cbcd771f0600d1f78c19f205c45e3793
+_md5_=3a2703e2ea97e9e77cc3ab73b9bdea91
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
index a79485768aab..43cd590d5638 100644
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
@@ -5,7 +5,7 @@ DESCRIPTION=Provides enhanced HTTPS support for httplib and urllib2 using PyOpen
 EAPI=7
 HOMEPAGE=https://github.com/cedadev/ndg_httpsclient/ https://pypi.org/project/ndg-httpsclient/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/pyaes[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/ndg-httpsclient/ndg_httpsclient-0.5.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dc0fb68964ed7fbecb015ac407bbd567
+_md5_=5891d4594b85ff257f107f3bc05d14d6
diff --git a/metadata/md5-cache/dev-python/os-brick-4.0.1 b/metadata/md5-cache/dev-python/os-brick-4.0.1
index 072b90644dff..20b1b82c1411 100644
--- a/metadata/md5-cache/dev-python/os-brick-4.0.1
+++ b/metadata/md5-cache/dev-python/os-brick-4.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=OpenStack Cinder brick library for managing local volume attaches
 EAPI=7
 HOMEPAGE=https://github.com/openstack/cinder
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-5.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.15.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.44.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.24.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-2.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.34.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tenacity-6.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-win-3.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-brick/os-brick-4.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b5db10152810112593838c0f31c72e6b
+_md5_=bc6235e9a0733ad2a2a4a050eb469f64
diff --git a/metadata/md5-cache/dev-python/packaging-20.5 b/metadata/md5-cache/dev-python/packaging-20.5
new file mode 100644
index 000000000000..d2bafb4e1dd1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/packaging-20.5
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Core utilities for Python packages
+EAPI=7
+HOMEPAGE=https://github.com/pypa/packaging/ https://pypi.org/project/packaging/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Apache-2.0 BSD-2 )
+RDEPEND=>=dev-python/pyparsing-2.1.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/packaging/archive/20.5.tar.gz -> packaging-20.5.gh.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=be419f13249e5193cd11377eca58ad0e
diff --git a/metadata/md5-cache/dev-python/packaging-20.7 b/metadata/md5-cache/dev-python/packaging-20.7
new file mode 100644
index 000000000000..4f2e160b15c8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/packaging-20.7
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Core utilities for Python packages
+EAPI=7
+HOMEPAGE=https://github.com/pypa/packaging/ https://pypi.org/project/packaging/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Apache-2.0 BSD-2 )
+RDEPEND=>=dev-python/pyparsing-2.1.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/packaging/archive/20.7.tar.gz -> packaging-20.7.gh.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=be419f13249e5193cd11377eca58ad0e
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.4 b/metadata/md5-cache/dev-python/passlib-1.7.4
index fc319a5ca42a..14563dd3e61b 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.4
+++ b/metadata/md5-cache/dev-python/passlib-1.7.4
@@ -4,7 +4,7 @@ DESCRIPTION=Password hashing framework supporting over 20 schemes
 EAPI=7
 HOMEPAGE=https://foss.heptapod.net/python-libs/passlib/wikis/home
 IUSE=+bcrypt doc +scrypt +totp test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=bcrypt? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) totp? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) scrypt? ( dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passlib/passlib-1.7.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3c7c75dd44494cd08099e43ae24bd379
+_md5_=8a40763ca5126687f0a2ff872a6ca979
diff --git a/metadata/md5-cache/dev-python/pastedeploy-2.1.1 b/metadata/md5-cache/dev-python/pastedeploy-2.1.1
index 4081f9409e62..46576503c97c 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-2.1.1
+++ b/metadata/md5-cache/dev-python/pastedeploy-2.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Load, configure, and compose WSGI applications and servers
 EAPI=7
 HOMEPAGE=https://pypi.org/project/PasteDeploy/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pylons/pastedeploy/archive/2.1.1.tar.gz -> pastedeploy-2.1.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca6f12a141b21eecabff62f8101e629f
+_md5_=d2f069ac4b3c0a4b0978254443dccbbe
diff --git a/metadata/md5-cache/dev-python/path-py-15.0.0 b/metadata/md5-cache/dev-python/path-py-15.0.0
index 821a58c1b89f..bb6b0dfa48b8 100644
--- a/metadata/md5-cache/dev-python/path-py-15.0.0
+++ b/metadata/md5-cache/dev-python/path-py-15.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A module wrapper for os.path
 EAPI=7
 HOMEPAGE=https://pypi.org/project/path/ https://github.com/jaraco/path
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-python/pytest-shutil-1.7.0-r1 !<dev-python/pytest-virtualenv-1.7.0-r1 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/path/path-15.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=89184e22fe83e2ba38525a00e3ee2a6e
+_md5_=a6eeaff18eadbfc14b738bbc470dc1d4
diff --git a/metadata/md5-cache/dev-python/pathlib2-2.3.5-r1 b/metadata/md5-cache/dev-python/pathlib2-2.3.5-r1
index 9cc77c7eb905..e2796c318540 100644
--- a/metadata/md5-cache/dev-python/pathlib2-2.3.5-r1
+++ b/metadata/md5-cache/dev-python/pathlib2-2.3.5-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Fork of pathlib aiming to support the full stdlib Python API
 EAPI=7
 HOMEPAGE=https://github.com/mcmtroffaes/pathlib2
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib2/pathlib2-2.3.5.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=501d4b0c1f42157e3bfdd3799d5e0a80
+_md5_=a76daec407abab7876ac8d2cfc0e54ad
diff --git a/metadata/md5-cache/dev-python/pathspec-0.8.0 b/metadata/md5-cache/dev-python/pathspec-0.8.0
index c60a753ecd22..108936f57239 100644
--- a/metadata/md5-cache/dev-python/pathspec-0.8.0
+++ b/metadata/md5-cache/dev-python/pathspec-0.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Utility library for gitignore style pattern matching of file paths.
 EAPI=7
 HOMEPAGE=https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MPL-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathspec/pathspec-0.8.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=622f6daf3ba425f3ece1523aed3b4ae3
+_md5_=5cd2122467ddeb9cac7c2fd1864f0eff
diff --git a/metadata/md5-cache/dev-python/pip-20.2.4 b/metadata/md5-cache/dev-python/pip-20.2.4
index 588305c08e7f..9a0fbeee5f44 100644
--- a/metadata/md5-cache/dev-python/pip-20.2.4
+++ b/metadata/md5-cache/dev-python/pip-20.2.4
@@ -5,7 +5,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
 EAPI=7
 HOMEPAGE=https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
 IUSE=test -vanilla python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/20.2.4.tar.gz -> pip-20.2.4.tar.gz test? ( https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-44.0.0-py2.py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.34.2-py2.py3-none-any.whl )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ee5e16aae40ae5a4a71951b21c625fde
+_md5_=5b915e69e3f9216101f4f9cff01f7856
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1 b/metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1
index 4692f77bf0ee..3e98ca0299b3 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1
+++ b/metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Provides an API for querying the distutils metadata written in a PKG
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pkginfo/
 IUSE=doc test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.5.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bcc770a31b1580ea8d8cb118b62ec126
+_md5_=8d74b16b175ef3e789ef0591e062c82c
diff --git a/metadata/md5-cache/dev-python/pluggy-0.13.1-r1 b/metadata/md5-cache/dev-python/pluggy-0.13.1-r1
index 705dd60ddf17..dfcc3b255fbd 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.13.1-r1
+++ b/metadata/md5-cache/dev-python/pluggy-0.13.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=plugin and hook calling mechanisms for python
 EAPI=7
 HOMEPAGE=https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.13.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f00324e34a2c25f41d9ddbdc084b6b09
+_md5_=2e99400483a3ab683ee5d5703198b2ea
diff --git a/metadata/md5-cache/dev-python/portend-2.7.0 b/metadata/md5-cache/dev-python/portend-2.7.0
index acbaf37f4eb3..10c3415f948e 100644
--- a/metadata/md5-cache/dev-python/portend-2.7.0
+++ b/metadata/md5-cache/dev-python/portend-2.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=TCP port monitoring utilities
 EAPI=7
 HOMEPAGE=https://pypi.org/project/portend/ https://github.com/jaraco/portend
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.7.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c29b3dadaab36eb16f65dffe9323730f
+_md5_=c1a93aeed3f7ad8150de2b35ab5bc60d
diff --git a/metadata/md5-cache/dev-python/process-tests-2.1.1 b/metadata/md5-cache/dev-python/process-tests-2.1.1
index 9da2a49cb1bd..e87e4a31131f 100644
--- a/metadata/md5-cache/dev-python/process-tests-2.1.1
+++ b/metadata/md5-cache/dev-python/process-tests-2.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for testing processes
 EAPI=7
 HOMEPAGE=https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/process-tests/process-tests-2.1.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=46e6b1abd2ca3f72e4e726992b275f4d
+_md5_=729620605848a32e498ccd4f8cabe226
diff --git a/metadata/md5-cache/dev-python/psutil-5.7.3 b/metadata/md5-cache/dev-python/psutil-5.7.3
index b0c483f95338..54c9f040b273 100644
--- a/metadata/md5-cache/dev-python/psutil-5.7.3
+++ b/metadata/md5-cache/dev-python/psutil-5.7.3
@@ -4,7 +4,7 @@ DESCRIPTION=Retrieve information on running processes and system utilization
 EAPI=7
 HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.org/project/psutil/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.7.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e9e10a6266435a52b14bc97d70e46cc8
+_md5_=8bfe98a6791fdf906aedab54b6fad1e3
diff --git a/metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1 b/metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1
index b83b7b8d4b32..078d3f0acd9c 100644
--- a/metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Run a subprocess in a pseudo terminal
 EAPI=7
 HOMEPAGE=https://github.com/pexpect/ptyprocess
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=ISC
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/ptyprocess/ptyprocess-0.6.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=69552a24f38a6fc1f7f481dac06f5e15
+_md5_=647e22ae51b7466d5be6978e62cbed1b
diff --git a/metadata/md5-cache/dev-python/pyaes-1.6.1-r2 b/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
index 1ab2be8d37cf..29faf19034cf 100644
--- a/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
+++ b/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Pure-Python Implementation of the AES block-cipher and common modes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pyaes/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyaes/pyaes-1.6.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=985dc2c302ac83c5d0a0d1f8b567fc6c
+_md5_=48b6c02bd3bb6d37e55e4d8a21e670d6
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1 b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
index 364349e901ba..c416cac12f6f 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
@@ -5,7 +5,7 @@ DESCRIPTION=pyasn1 modules
 EAPI=7
 HOMEPAGE=http://snmplabs.com/pyasn1/ https://github.com/etingof/pyasn1-modules/
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD-2
 RDEPEND=>=dev-python/pyasn1-0.4.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.2.8.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5c8a68da381f15881695d468285f79ad
+_md5_=565e2732ddce95df3257fda2ac272cbe
diff --git a/metadata/md5-cache/dev-python/pydocstyle-5.1.1 b/metadata/md5-cache/dev-python/pydocstyle-5.1.1
index e038ccc62b57..c7798f2a0b1f 100644
--- a/metadata/md5-cache/dev-python/pydocstyle-5.1.1
+++ b/metadata/md5-cache/dev-python/pydocstyle-5.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_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 ~ia64 ~sparc x86
+KEYWORDS=amd64 arm64 ~ia64 ~sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/snowballstemmer[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/pydocstyle/archive/5.1.1.tar.gz -> pydocstyle-5.1.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=68f5dcb0e9859d54c3fedc2deed94931
+_md5_=fe5c4824da73d01c73e51954efa11192
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.3.2 b/metadata/md5-cache/dev-python/pyfakefs-4.3.2
index c5cd4376c6f9..80e1353375ce 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.3.2
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=a fake file system that mocks the Python file system modules
 EAPI=7
 HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.3.2.tar.gz -> pyfakefs-4.3.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d38052ba111a2ed277aa999a81850359
+_md5_=2b07be9d0c14443b370af32437363c0a
diff --git a/metadata/md5-cache/dev-python/pyhamcrest-2.0.2 b/metadata/md5-cache/dev-python/pyhamcrest-2.0.2
index a45f38bd148e..730ea586d2c1 100644
--- a/metadata/md5-cache/dev-python/pyhamcrest-2.0.2
+++ b/metadata/md5-cache/dev-python/pyhamcrest-2.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Hamcrest framework for matcher objects
 EAPI=7
 HOMEPAGE=https://github.com/hamcrest/PyHamcrest
 IUSE=examples doc test python_targets_python3_6 python_targets_python3_7 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
+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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/PyHamcrest/archive/V2.0.2.tar.gz -> PyHamcrest-2.0.2.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=efd5bee9440ecd94abaabdb94ec1e648
+_md5_=32484674c3efe91874c0aa38b3f6139e
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 aceaa55d1973..cbedd6e8c448 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_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~ia64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~x86 ~x64-macos
 LICENSE=LGPL-3
 RDEPEND=>=dev-python/mccabe-0.5.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pycodestyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyflakes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -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	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b10e54081632b06468e0e7d21e09909c
+_md5_=d481b64a631712cbba1717d79730f0df
diff --git a/metadata/md5-cache/dev-python/pylibacl-0.6.0 b/metadata/md5-cache/dev-python/pylibacl-0.6.0
new file mode 100644
index 000000000000..6df42082aca7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylibacl-0.6.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( sys-apps/acl >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-apps/acl
+DESCRIPTION=POSIX ACLs (Access Control Lists) for Python
+EAPI=7
+HOMEPAGE=https://pylibacl.k1024.org/ https://pypi.org/project/pylibacl/ https://github.com/iustin/pylibacl/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-apps/acl python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/iustin/pylibacl/archive/v0.6.0.tar.gz -> pylibacl-0.6.0.gh.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=152ad89d765ca818e114139941adcc96
diff --git a/metadata/md5-cache/dev-python/pyopenssl-20.0.0 b/metadata/md5-cache/dev-python/pyopenssl-20.0.0
new file mode 100644
index 000000000000..e61fae379931
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopenssl-20.0.0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/six-1.5.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-3.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-3.0.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Python interface to the OpenSSL library
+EAPI=7
+HOMEPAGE=https://www.pyopenssl.org/ https://pypi.org/project/pyOpenSSL/ https://github.com/pyca/pyopenssl/
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/six-1.5.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-3.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-20.0.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=20235421784567258e47fc8a65cd63d6
diff --git a/metadata/md5-cache/dev-python/pypiserver-1.4.2 b/metadata/md5-cache/dev-python/pypiserver-1.4.2
index 48bd4f146fb6..440d9fb886b7 100644
--- a/metadata/md5-cache/dev-python/pypiserver-1.4.2
+++ b/metadata/md5-cache/dev-python/pypiserver-1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Minimal PyPI server
 EAPI=7
 HOMEPAGE=https://github.com/pypiserver/pypiserver
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=ZLIB MIT
 RDEPEND=dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wheel-0.25.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypiserver/pypiserver/archive/v1.4.2.tar.gz -> pypiserver-1.4.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=929c5b297c2c502a5602518e32d00a85
+_md5_=f66ba9da639424d110f4da37b5cbf13d
diff --git a/metadata/md5-cache/dev-python/pypowervm-1.1.20 b/metadata/md5-cache/dev-python/pypowervm-1.1.20
deleted file mode 100644
index f46ccfbfb397..000000000000
--- a/metadata/md5-cache/dev-python/pypowervm-1.1.20
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Python binding for the PowerVM REST API
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pypowervm/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1-modules[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pypowervm/pypowervm-1.1.20.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6b6c5a66dbcdd781c7253ffa58333d34
diff --git a/metadata/md5-cache/dev-python/pypowervm-1.1.24 b/metadata/md5-cache/dev-python/pypowervm-1.1.24
index 8337d4f64954..b5ae2ec90382 100644
--- a/metadata/md5-cache/dev-python/pypowervm-1.1.24
+++ b/metadata/md5-cache/dev-python/pypowervm-1.1.24
@@ -5,11 +5,11 @@ DESCRIPTION=Python binding for the PowerVM REST API
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pypowervm/
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/lxml-3.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.22.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1-modules[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytz-2013.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypowervm/pypowervm-1.1.24.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=63aada8b8ad0e8ef434e14afac212fd4
+_md5_=504700176c4b636f66e2ffa2d19a5a5b
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-9 b/metadata/md5-cache/dev-python/pyproject2setuppy-9
index 50c130e6835c..02250e342298 100644
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-9
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-9
@@ -4,7 +4,7 @@ DESCRIPTION=Cheap setup.py hack to install flit & poetry-based projects
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/pyproject2setuppy
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v9.tar.gz -> pyproject2setuppy-9.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=22a8861637e21f361d65f41e148aae0d
+_md5_=d9ac5eaf27557d2779b59aed65112f87
diff --git a/metadata/md5-cache/dev-python/pyquery-1.4.3 b/metadata/md5-cache/dev-python/pyquery-1.4.3
index 32542bf8115b..4b13fa7bad68 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.4.3
+++ b/metadata/md5-cache/dev-python/pyquery-1.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=A jQuery-like library for python
 EAPI=7
 HOMEPAGE=https://github.com/gawel/pyquery
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >dev-python/cssselect-0.7.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/webob-1.1.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.4.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9923893c4d0d7950f84932e310dbd068
+_md5_=885d00e89b5454591ea230814c1379cb
diff --git a/metadata/md5-cache/dev-python/pyserial-3.5 b/metadata/md5-cache/dev-python/pyserial-3.5
index 0dd772dbc28f..cfaba1bdd3ab 100644
--- a/metadata/md5-cache/dev-python/pyserial-3.5
+++ b/metadata/md5-cache/dev-python/pyserial-3.5
@@ -4,11 +4,11 @@ DESCRIPTION=Python Serial Port extension
 EAPI=7
 HOMEPAGE=https://github.com/pyserial/pyserial https://pypi.org/project/pyserial/
 IUSE=examples doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=PSF-2
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyserial/pyserial-3.5.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5b001e18e7b7f52c8e0803e70a4ed92d
+_md5_=064a701e65112a3dce957e918dc59fd5
diff --git a/metadata/md5-cache/dev-python/pytest-6.1.2 b/metadata/md5-cache/dev-python/pytest-6.1.2
index 1a37f526c757..ff4e045fc304 100644
--- a/metadata/md5-cache/dev-python/pytest-6.1.2
+++ b/metadata/md5-cache/dev-python/pytest-6.1.2
@@ -5,7 +5,7 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=7
 HOMEPAGE=https://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-6.1.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=763b2811a39350be5709eb2139b70ca5
+_md5_=7e8bdc07f6dfdf4fbbc0b90dad7b0fb7
diff --git a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1 b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
index 4cd66688c0b0..563e3f4b33d3 100644
--- a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=pytest plugin for aiohttp support
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/pytest-aiohttp/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-5.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/aiohttp-0.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-0.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=36af594b665568c19fc402ff3e1f6f8f
+_md5_=881f0e424a10b8b0b368b5a9663c3dbc
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0 b/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
index 535f9d939d01..7efe1093164f 100644
--- a/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
@@ -4,7 +4,7 @@ DESCRIPTION=Library for testing asyncio code with pytest
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-asyncio https://pypi.org/project/pytest-asyncio/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-5.4.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-asyncio/archive/v0.14.0.tar.gz -> pytest-asyncio-0.14.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2fee7687dff3d0e6c59802c94cb37f15
+_md5_=40a193a1d9c73e5e8eedbae38a1ce559
diff --git a/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2 b/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
index 679f61a0e491..4f8832b8ba39 100644
--- a/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
+++ b/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Easily freeze time in pytest test + fixtures
 EAPI=7
 HOMEPAGE=https://github.com/ktosiek/pytest-freezegun
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ktosiek/pytest-freezegun/archive/0.4.2.tar.gz -> pytest-freezegun-0.4.2.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c27c129f67eea7c46f0aa2c5314f190e
+_md5_=fb5061a621d1ea9da51a5331d2a3ee45
diff --git a/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1 b/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
index f5efcbae9628..32ba7d2d80c0 100644
--- a/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Easily test your HTTP library against a local copy of httpbin
 EAPI=7
 HOMEPAGE=https://github.com/kevin1024/pytest-httpbin https://pypi.org/project/pytest-httpbin/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/httpbin[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kevin1024/pytest-httpbin/archive/v1.0.0.tar.gz -> pytest-httpbin-1.0.0.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b10d273bb75fa4dbb0fb65ee85d7456e
+_md5_=db757cd4ccda1d86a034f91073f43000
diff --git a/metadata/md5-cache/dev-python/pytest-localserver-0.5.0 b/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
index 779e6bb8d47f..1f795e70a01d 100644
--- a/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
+++ b/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Py.test plugin to test server connections locally
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-localserver/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/werkzeug-0.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-localserver/pytest-localserver-0.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7cacd0ccb01090180cf54694b9436572
+_md5_=c497c0f45e02ee165a80f60f91fe86cd
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.3.1 b/metadata/md5-cache/dev-python/pytest-mock-3.3.1
index 50780248c552..9690b61cff17 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-3.3.1
+++ b/metadata/md5-cache/dev-python/pytest-mock-3.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Thin-wrapper around the mock package for easier use with pytest
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-mock/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-3.3.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ac31f64d8d52f4140ab477fe87145988
+_md5_=ac5bf72ed239cd8479fee33dde28f0d9
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.1.0 b/metadata/md5-cache/dev-python/pytest-xdist-2.1.0
index 0eec0e938445..e21f9be7d627 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.1.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Distributed testing and loop-on-failing modes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7867276c6c5d2397ce4e8229f8a857c8
+_md5_=e679f223282a4b582ead350ef075929e
diff --git a/metadata/md5-cache/dev-python/python-docs-3.8.5 b/metadata/md5-cache/dev-python/python-docs-3.8.5
deleted file mode 100644
index e022324bccdc..000000000000
--- a/metadata/md5-cache/dev-python/python-docs-3.8.5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/doc/3.8.5/python-3.8.5-docs-html.tar.bz2
-_md5_=1e217674beae9645118b055addbdd07c
diff --git a/metadata/md5-cache/dev-python/python-docs-3.8.6 b/metadata/md5-cache/dev-python/python-docs-3.8.6
index 537f345e3ff8..8c1431a257f2 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.8.6
+++ b/metadata/md5-cache/dev-python/python-docs-3.8.6
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/doc/3.8.6/python-3.8.6-docs-html.tar.bz2
-_md5_=fd1b6367cd0aabc5d3f4c4769be1297e
+_md5_=1e217674beae9645118b055addbdd07c
diff --git a/metadata/md5-cache/dev-python/python-mpd-1.1.0-r1 b/metadata/md5-cache/dev-python/python-mpd-1.1.0-r1
index 28223bbb6d8c..1ad5c0536d60 100644
--- a/metadata/md5-cache/dev-python/python-mpd-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/python-mpd-1.1.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Python MPD client library
 EAPI=7
 HOMEPAGE=https://github.com/Mic92/python-mpd2
 IUSE=examples +twisted doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=LGPL-3+
 RDEPEND=twisted? ( dev-python/twisted[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=test? ( twisted ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Mic92/python-mpd2/archive/v1.1.0.tar.gz -> python-mpd-1.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=db00b01a929922e55b7a6a9f945dbdf0
+_md5_=647ed47f3063de80164f14d4a410ace6
diff --git a/metadata/md5-cache/dev-python/re-assert-1.1.0 b/metadata/md5-cache/dev-python/re-assert-1.1.0
index b6038d118099..8f3ae8c08185 100644
--- a/metadata/md5-cache/dev-python/re-assert-1.1.0
+++ b/metadata/md5-cache/dev-python/re-assert-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Show where your regex match assertion failed
 EAPI=7
 HOMEPAGE=https://github.com/asottile/re-assert
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asottile/re-assert/archive/v1.1.0.tar.gz -> re-assert-1.1.0.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=21e8d02cfb0f526f9a9dc2e4cdfb56eb
+_md5_=65bee92525a990f9de72f21b5dc4db2b
diff --git a/metadata/md5-cache/dev-python/readme_renderer-28.0 b/metadata/md5-cache/dev-python/readme_renderer-28.0
index a5ce31bb4d63..e319e9e172c9 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-28.0
+++ b/metadata/md5-cache/dev-python/readme_renderer-28.0
@@ -4,7 +4,7 @@ DESCRIPTION=a library for rendering "readme" descriptions for Warehouse
 EAPI=7
 HOMEPAGE=https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.5.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-28.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9297eb2674c714bd1fca6bcc763e7715
+_md5_=51e8d6d7232c0804e987ce92266b80fb
diff --git a/metadata/md5-cache/dev-python/reedsolomon-1.5.4 b/metadata/md5-cache/dev-python/reedsolomon-1.5.4
new file mode 100644
index 000000000000..d55b5d44dd13
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reedsolomon-1.5.4
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure-Python Reed Solomon encoder/decoder
+EAPI=7
+HOMEPAGE=https://github.com/tomerfiliba/reedsolomon https://pypi.org/project/reedsolo/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tomerfiliba/reedsolomon/archive/v1.5.4.tar.gz -> reedsolomon-1.5.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a596bd3d291518bda79515735edb14a0
diff --git a/metadata/md5-cache/dev-python/regex-2020.4.4-r1 b/metadata/md5-cache/dev-python/regex-2020.4.4-r1
index 21b9030e2766..05f55b8f63e4 100644
--- a/metadata/md5-cache/dev-python/regex-2020.4.4-r1
+++ b/metadata/md5-cache/dev-python/regex-2020.4.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Alternative regular expression module to replace re
 EAPI=7
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
 IUSE=doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2020.4.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=90838f2530374a3843ffdcfb902b8d1d
+_md5_=25feaadaa10066c00ca3e24ac794a0f2
diff --git a/metadata/md5-cache/dev-python/requests-2.25.0 b/metadata/md5-cache/dev-python/requests-2.25.0
index b3ba93690b6e..bf319411a19c 100644
--- a/metadata/md5-cache/dev-python/requests-2.25.0
+++ b/metadata/md5-cache/dev-python/requests-2.25.0
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library for human beings
 EAPI=7
 HOMEPAGE=https://requests.readthedocs.io/
 IUSE=socks5 +ssl test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/chardet-3.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/chardet-4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/idna-3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/urllib3-1.27[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ssl? ( >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.25.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f70826e91d0f6a03a209d5be269ff3c1
+_md5_=6625e7bde713d444831f35e77bf03867
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1 b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
index 138ee90c45a5..b6097ed6d32d 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
@@ -5,7 +5,7 @@ DESCRIPTION=A utility belt for advanced users of python-requests
 EAPI=7
 HOMEPAGE=https://toolbelt.readthedocs.org/
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/requests-3.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-0.9.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3b65e5d1b8eb21e4c32e0c5d697d30a0
+_md5_=eab9c5e051e6ca643349c67c8b84809f
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.4.0 b/metadata/md5-cache/dev-python/rfc3986-1.4.0
index 8318cd59b974..a0f213c55155 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.4.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=Validating URI References per RFC 3986
 EAPI=7
 HOMEPAGE=https://tools.ietf.org/html/rfc3986 https://github.com/python-hyper/rfc3986 https://rfc3986.rtfd.org
 IUSE=idna test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.4.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c81c26f655bf0e90ddc0dd0ee26bd93d
+_md5_=64f5d38a277c53ea4a6b1d117893885f
diff --git a/metadata/md5-cache/dev-python/scripttest-1.3.0-r1 b/metadata/md5-cache/dev-python/scripttest-1.3.0-r1
index 192bbf3b2fb3..f091f17d7ee6 100644
--- a/metadata/md5-cache/dev-python/scripttest-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/scripttest-1.3.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A very small text templating language
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ScriptTest/ https://github.com/pypa/scripttest
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
+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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/scripttest/archive/1.3.0.tar.gz -> scripttest-1.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f94b5b4af9da5723f701e16a1aad0e90
+_md5_=62e24a26937447306033a7e0fb5aceea
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.16 b/metadata/md5-cache/dev-python/scrypt-0.8.16
index 2326c73e6f5a..f827d3f6126a 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.16
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.16
@@ -5,7 +5,7 @@ DESCRIPTION=Bindings for the scrypt key derivation function library
 EAPI=7
 HOMEPAGE=https://github.com/holgern/py-scrypt/
 IUSE=libressl test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.16.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c21d6909dc6f82e98d8ce625d4d5f2b
+_md5_=4eca747b82d17007d35d1b970404dc6a
diff --git a/metadata/md5-cache/dev-python/selenium-3.141.0-r1 b/metadata/md5-cache/dev-python/selenium-3.141.0-r1
index 20153697eec9..9811d278374f 100644
--- a/metadata/md5-cache/dev-python/selenium-3.141.0-r1
+++ b/metadata/md5-cache/dev-python/selenium-3.141.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python language binding for Selenium Remote Control
 EAPI=7
 HOMEPAGE=https://www.seleniumhq.org
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/selenium/selenium-3.141.0.tar.gz test? ( https://github.com/SeleniumHQ/selenium/archive/selenium-3.141.0.tar.gz -> selenium-3.141.0.gh.tar.gz )
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0da67c2e670bfda08f7c7ac8823e79a1
+_md5_=cfda3a0179c7bc11ebfb695918a286c7
diff --git a/metadata/md5-cache/dev-python/service_identity-18.1.0-r1 b/metadata/md5-cache/dev-python/service_identity-18.1.0-r1
index 49a38849075c..4077976a04b1 100644
--- a/metadata/md5-cache/dev-python/service_identity-18.1.0-r1
+++ b/metadata/md5-cache/dev-python/service_identity-18.1.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Service identity verification for pyOpenSSL
 EAPI=7
 HOMEPAGE=https://github.com/pyca/service-identity
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/attrs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyca/service-identity/archive/18.1.0.tar.gz -> service_identity-18.1.0.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7c4485775c11d444d7ed6a77f96cbca3
+_md5_=19a70eba6b04fa9872e785e4fb1aed5e
diff --git a/metadata/md5-cache/dev-python/setuptools-git-1.2-r2 b/metadata/md5-cache/dev-python/setuptools-git-1.2-r2
index 81441632ed31..441b35228c44 100644
--- a/metadata/md5-cache/dev-python/setuptools-git-1.2-r2
+++ b/metadata/md5-cache/dev-python/setuptools-git-1.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Setuptools revision control system plugin for Git
 EAPI=7
 HOMEPAGE=https://github.com/wichert/setuptools-git
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 x64-macos
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools-git/setuptools-git-1.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=695c3ace2fda1bf0da55705d983f5140
+_md5_=6e5facf7430764b53873767352f0b334
diff --git a/metadata/md5-cache/dev-python/sip-4.19.22-r1 b/metadata/md5-cache/dev-python/sip-4.19.22-r1
deleted file mode 100644
index 5d487b08bd94..000000000000
--- a/metadata/md5-cache/dev-python/sip-4.19.22-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Python extension module generator for C and C++ libraries
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/12
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.22/sip-4.19.22.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c2ad800d721d13a592394b020b47523d
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.8.8 b/metadata/md5-cache/dev-python/snakeoil-0.8.8
index 877837608e94..0e2c83624a2e 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.8.8
+++ b/metadata/md5-cache/dev-python/snakeoil-0.8.8
@@ -4,7 +4,7 @@ DESCRIPTION=misc common functionality and useful optimizations
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/snakeoil
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=BSD BSD-2 MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.8.8.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ffd179c2940aef1f6301810233eeca8
+_md5_=373096de604dc7cac0598ac22776f894
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-2.0.0 b/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
index 60830eda1c3d..cc5fe10a1979 100644
--- a/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
+++ b/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Stemmer algorithms generated from Snowball algorithms
 EAPI=7
 HOMEPAGE=https://snowballstem.org/ https://github.com/snowballstem/snowball https://pypi.org/project/snowballstemmer/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snowballstemmer/snowballstemmer-2.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=89e068dd23675b880c68ae6b6d0e28c0
+_md5_=2bd1632017d46502346b7f83f4663c4b
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.3-r3 b/metadata/md5-cache/dev-python/socketpool-0.5.3-r3
index 78e0ed5d6fa2..1f7812e4cad4 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.3-r3
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.3-r3
@@ -4,7 +4,7 @@ DESCRIPTION=A simple Python socket pool
 EAPI=7
 HOMEPAGE=https://github.com/benoitc/socketpool/
 IUSE=eventlet examples gevent test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x64-macos
 LICENSE=|| ( MIT public-domain )
 RDEPEND=eventlet? ( python_targets_python3_6? ( dev-python/eventlet[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/eventlet[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/eventlet[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/eventlet[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) gevent? ( python_targets_python3_6? ( dev-python/gevent[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/gevent[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/gevent[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/gevent[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketpool/socketpool-0.5.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a17ac20db35c4a0e2de1572692d09173
+_md5_=fb0287689f67e626f3193a8bf0689a72
diff --git a/metadata/md5-cache/dev-python/sortedcontainers-2.3.0 b/metadata/md5-cache/dev-python/sortedcontainers-2.3.0
index 626775812332..1dc08f515efa 100644
--- a/metadata/md5-cache/dev-python/sortedcontainers-2.3.0
+++ b/metadata/md5-cache/dev-python/sortedcontainers-2.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python library to sort collections and containers
 EAPI=7
 HOMEPAGE=http://www.grantjenks.com/docs/sortedcontainers/ https://pypi.org/project/sortedcontainers/ https://github.com/grantjenks/python-sortedcontainers/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grantjenks/python-sortedcontainers/archive/v2.3.0.tar.gz -> python-sortedcontainers-2.3.0.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8a9a9308d162561c70b03ff01c3f6204
+_md5_=020936a702f7d33a113bf62b9693ea2a
diff --git a/metadata/md5-cache/dev-python/soupsieve-2.0.1 b/metadata/md5-cache/dev-python/soupsieve-2.0.1
index 18f7c2758faf..11509e693426 100644
--- a/metadata/md5-cache/dev-python/soupsieve-2.0.1
+++ b/metadata/md5-cache/dev-python/soupsieve-2.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=A modern CSS selector implementation for BeautifulSoup
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/soupsieve https://pypi.python.org/pypi/soupsieve
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/soupsieve/archive/2.0.1.tar.gz -> soupsieve-2.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a47b4a4678b9e861277a277b9dcb8ab2
+_md5_=3046e38216c90569ca34b75c04247653
diff --git a/metadata/md5-cache/dev-python/tempora-4.0.1 b/metadata/md5-cache/dev-python/tempora-4.0.1
index 5bbb1f3258a4..5151573a9c7c 100644
--- a/metadata/md5-cache/dev-python/tempora-4.0.1
+++ b/metadata/md5-cache/dev-python/tempora-4.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Objects and routines pertaining to date and time
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/tempora
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-4.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b9eab730390ad4a8df78a3b3212d5560
+_md5_=8bf2e4194e5d687d33d21727740e9974
diff --git a/metadata/md5-cache/dev-python/testpath-0.4.4-r1 b/metadata/md5-cache/dev-python/testpath-0.4.4-r1
index d0c586c88c73..328d172cb53a 100644
--- a/metadata/md5-cache/dev-python/testpath-0.4.4-r1
+++ b/metadata/md5-cache/dev-python/testpath-0.4.4-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Test utilities for code working with files and commands
 EAPI=7
 HOMEPAGE=https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/testpath/archive/0.4.4.tar.gz -> testpath-0.4.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4cd4074f3fe0839d989edd24b296cf87
+_md5_=43931daf3ca09bf15e91d14b4715bb10
diff --git a/metadata/md5-cache/dev-python/toml-0.10.2 b/metadata/md5-cache/dev-python/toml-0.10.2
index 57f851c50c3e..f0f1d3ef212f 100644
--- a/metadata/md5-cache/dev-python/toml-0.10.2
+++ b/metadata/md5-cache/dev-python/toml-0.10.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python library for handling TOML files
 EAPI=7
 HOMEPAGE=https://github.com/uiri/toml
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uiri/toml/archive/0.10.2.tar.gz -> toml-0.10.2-1.tar.gz test? ( https://github.com/BurntSushi/toml-test/archive/280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz -> toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz )
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=85f9eb219142eebb847bb23a008b871e
+_md5_=3577756687e0a29291769af657a4562a
diff --git a/metadata/md5-cache/dev-python/tqdm-4.54.0 b/metadata/md5-cache/dev-python/tqdm-4.54.0
new file mode 100644
index 000000000000..ebc11ac74275
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tqdm-4.54.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Add a progress meter to your loops in a second
+EAPI=7
+HOMEPAGE=https://github.com/tqdm/tqdm
+IUSE=examples test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tqdm/tqdm-4.54.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8226a7e560259c2b06c291a4e6e3013d
diff --git a/metadata/md5-cache/dev-python/trustme-0.6.0-r1 b/metadata/md5-cache/dev-python/trustme-0.6.0-r1
index 5b737a812700..fae409f3d716 100644
--- a/metadata/md5-cache/dev-python/trustme-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/trustme-0.6.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=#1 quality TLS certs while you wait, for the discerning tester
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/trustme
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.6.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=048b81e67708776c8cc01cda0a1263f9
+_md5_=4e0346cdc3d0c895caac75cc92d1699f
diff --git a/metadata/md5-cache/dev-python/twine-3.2.0 b/metadata/md5-cache/dev-python/twine-3.2.0
index 8f8fbeac5841..9937bb29a37b 100644
--- a/metadata/md5-cache/dev-python/twine-3.2.0
+++ b/metadata/md5-cache/dev-python/twine-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of utilities for publishing packages on PyPI
 EAPI=7
 HOMEPAGE=https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/twine/archive/3.2.0.tar.gz -> twine-3.2.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4104b5c3b915ccccaf8d32a2360e41e4
+_md5_=7b6c79906b9988d4bdfd3437a3a837f2
diff --git a/metadata/md5-cache/dev-python/typed-ast-1.4.1 b/metadata/md5-cache/dev-python/typed-ast-1.4.1
index d74ead4c65a7..a9d4bd659125 100644
--- a/metadata/md5-cache/dev-python/typed-ast-1.4.1
+++ b/metadata/md5-cache/dev-python/typed-ast-1.4.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python typed-ast backported
 EAPI=7
 HOMEPAGE=https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=Apache-2.0 MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/typed_ast/typed_ast-1.4.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bd00633781e371c1db5d347d124b63d7
+_md5_=d558e2234c1bcd4cd8c10a11aec7dd4b
diff --git a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3 b/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
index c2c4fd4e5191..4d2c32e8ef04 100644
--- a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
+++ b/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=Type Hint extensions from Python 3.8 backported
 EAPI=7
 HOMEPAGE=https://pypi.org/project/typing_extensions/ https://github.com/python/typing
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 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-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing_extensions/typing_extensions-3.7.4.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d2ba1d68dadc7612c596ecb67a08c60f
+_md5_=7aba822cd552f4f02aea580063501b27
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.2 b/metadata/md5-cache/dev-python/urllib3-1.26.2
index 8c48d53183c8..285ac7a3bf86 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.2
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.2
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and mor
 EAPI=7
 HOMEPAGE=https://github.com/urllib3/urllib3
 IUSE=brotli test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlipy[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a585e70d09da9a0521e76973fb8ac31b
+_md5_=e63d275624c1760767f184c677a73910
diff --git a/metadata/md5-cache/dev-python/vcrpy-4.1.1 b/metadata/md5-cache/dev-python/vcrpy-4.1.1
index 6601f9019107..d9fcb6145570 100644
--- a/metadata/md5-cache/dev-python/vcrpy-4.1.1
+++ b/metadata/md5-cache/dev-python/vcrpy-4.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Automatically mock your HTTP interactions to simplify and speed up t
 EAPI=7
 HOMEPAGE=https://github.com/kevin1024/vcrpy
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wrapt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/yarl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kevin1024/vcrpy/archive/v4.1.1.tar.gz -> vcrpy-4.1.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9126b45a5f7bee1b05a113f9a66f0917
+_md5_=7614c2cbd226d234838282e8cb646d3d
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.2.1 b/metadata/md5-cache/dev-python/virtualenv-20.2.1
index 21ce04ea10aa..6efbd9cd0257 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.2.1
+++ b/metadata/md5-cache/dev-python/virtualenv-20.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Virtual Python Environment builder
 EAPI=7
 HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.2.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3c5993343d7520b6d005583a347892c1
+_md5_=9967867ef4fca7140bf425ac5111d7c7
diff --git a/metadata/md5-cache/dev-python/waitress-1.4.4 b/metadata/md5-cache/dev-python/waitress-1.4.4
index 8beca05d6b54..a0517e05ca9c 100644
--- a/metadata/md5-cache/dev-python/waitress-1.4.4
+++ b/metadata/md5-cache/dev-python/waitress-1.4.4
@@ -4,7 +4,7 @@ DESCRIPTION=A pure-Python WSGI server
 EAPI=7
 HOMEPAGE=https://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.org/project/waitress/ https://github.com/Pylons/waitress
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=ZPL
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-1.4.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=03370832c5dbd5bd7759455e67db1579
+_md5_=67511361c3a26f1197382516a2f88b66
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.35 b/metadata/md5-cache/dev-python/webtest-2.0.35
index a2caf325e6c1..cbecb93c5060 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.35
+++ b/metadata/md5-cache/dev-python/webtest-2.0.35
@@ -4,7 +4,7 @@ DESCRIPTION=Helper to test WSGI applications
 EAPI=7
 HOMEPAGE=https://pypi.org/project/WebTest/
 IUSE=test doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pastedeploy[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/webob-1.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/waitress-0.8.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/beautifulsoup:4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.35.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cb9d38054faa1afc5c721d024c0ba69c
+_md5_=d40e03e1502b586bd3dd0d3011e0f719
diff --git a/metadata/md5-cache/dev-python/wheel-0.35.1-r1 b/metadata/md5-cache/dev-python/wheel-0.35.1-r1
index f55bf994cd26..b234bf2cd3ba 100644
--- a/metadata/md5-cache/dev-python/wheel-0.35.1-r1
+++ b/metadata/md5-cache/dev-python/wheel-0.35.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A built-package format for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/wheel/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/wheel/archive/0.35.1.tar.gz -> wheel-0.35.1.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b0e5a07952fa3cb176dc30ae02d0c646
+_md5_=783689cfad9a05887612fa52d8a2423b
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
index 31ccc5c251ba..5ef36fda5401 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP proxying tools for WSGI apps
 EAPI=7
 HOMEPAGE=https://pypi.org/project/WSGIProxy2/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.6.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b63158c7effe49f958e5e15db31fbf90
+_md5_=5a51b65b812117fd30870a78e2d1193a
diff --git a/metadata/md5-cache/dev-python/xcffib-0.11.0 b/metadata/md5-cache/dev-python/xcffib-0.11.0
new file mode 100644
index 000000000000..e05f83858ec0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xcffib-0.11.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xeyes ) test? ( python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/libxcb >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libxcb
+DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
+EAPI=7
+HOMEPAGE=https://github.com/tych0/xcffib
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/libxcb python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/x/xcffib/xcffib-0.11.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f073c52468c4d9a1745eaf5edb30a357
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.3.1 b/metadata/md5-cache/dev-python/xmlschema-1.3.1
index 026f4482b1c1..11dbc44809c8 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.3.1
+++ b/metadata/md5-cache/dev-python/xmlschema-1.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=An XML Schema validator and decoder
 EAPI=7
 HOMEPAGE=https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/elementpath-2.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.3.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b0f28c95114926533af426162695d7e2
+_md5_=56c947fd52ef75d8ed58738458bf8738
diff --git a/metadata/md5-cache/dev-python/yarl-1.6.3 b/metadata/md5-cache/dev-python/yarl-1.6.3
index 96e3d102b69f..a2e3409a4c40 100644
--- a/metadata/md5-cache/dev-python/yarl-1.6.3
+++ b/metadata/md5-cache/dev-python/yarl-1.6.3
@@ -4,7 +4,7 @@ DESCRIPTION=Yet another URL library
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/yarl/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.6.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8b7de813315153a8580e73170977b559
+_md5_=b3bdc945e9b53ed8b7c77ad81c98313d
diff --git a/metadata/md5-cache/dev-python/zipp-3.4.0 b/metadata/md5-cache/dev-python/zipp-3.4.0
index 42c706b614db..87961d58f1d6 100644
--- a/metadata/md5-cache/dev-python/zipp-3.4.0
+++ b/metadata/md5-cache/dev-python/zipp-3.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=Backport of pathlib-compatible object wrapper for zip files
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/zipp
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zipp/zipp-3.4.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3ea4d84d48a2d2bf2755909e63c0f5b7
+_md5_=46ea606a21fe423810537fefa645b408
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index d9b7b41248d1..e981668ea327 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2
index fc1bc34e26b5..4d30d6089a91 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2
@@ -12,4 +12,4 @@ 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
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qt5-build	c32e788e2242ba76553cf2edd88a4459	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c99d0397f837b6104fd51c2a2a1ec91c
+_md5_=343c438a5e831cb6e02f590eb41865e3
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 2ab88114ea21..d0b991373b04 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.4 b/metadata/md5-cache/dev-ruby/open4-1.3.4
index 925f6a3613bc..3c7813a86ed7 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.4
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.4
@@ -4,7 +4,7 @@ DESCRIPTION=Open3::popen3 with exit status
 EAPI=5
 HOMEPAGE=https://github.com/ahoward/open4
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/open4-1.3.4.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6b0c64e001d0c550fa0b898f10a3445f
+_md5_=7490c24767b8076f8cbe019d0652bad7
diff --git a/metadata/md5-cache/dev-ruby/pry-0.13.1 b/metadata/md5-cache/dev-ruby/pry-0.13.1
index 319ac1be0a61..1bd5c8608c44 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.13.1
+++ b/metadata/md5-cache/dev-ruby/pry-0.13.1
@@ -5,7 +5,7 @@ DESCRIPTION=Pry is a powerful alternative to the standard IRB shell for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/pry/pry/wiki
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby25(-)] =dev-ruby/coderay-1.1*[ruby_targets_ruby25(-)] =dev-ruby/method_source-1*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby26(-)] =dev-ruby/coderay-1.1*[ruby_targets_ruby26(-)] =dev-ruby/method_source-1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby27(-)] =dev-ruby/coderay-1.1*[ruby_targets_ruby27(-)] =dev-ruby/method_source-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ 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	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=29832c68dc6eaed48e5ec39b83a1e42d
+_md5_=8242c00fad9d949991d23da3a7a7b735
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index f6a5d91d422a..7b475f2718dc 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/sigscheme-0.8.5-r1 b/metadata/md5-cache/dev-scheme/sigscheme-0.8.5-r1
index 4d8f49d4f882..c2ca19d99f71 100644
--- a/metadata/md5-cache/dev-scheme/sigscheme-0.8.5-r1
+++ b/metadata/md5-cache/dev-scheme/sigscheme-0.8.5-r1
@@ -1,9 +1,9 @@
-DEFINED_PHASES=configure
+DEFINED_PHASES=configure install
 DESCRIPTION=SigScheme is an R5RS Scheme interpreter for embedded use
-EAPI=6
+EAPI=7
 HOMEPAGE=https://code.google.com/p/sigscheme/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://sigscheme.googlecode.com/files/sigscheme-0.8.5.tar.bz2
-_md5_=7076696d14cd907e728ff9fad67247b3
+_md5_=502ecb7d5d94020c74ced7ac52f6fa18
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 3ad8e535e69f..c914676b5b5c 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/android-ndk-10 b/metadata/md5-cache/dev-util/android-ndk-10
deleted file mode 100644
index a5d3399c2150..000000000000
--- a/metadata/md5-cache/dev-util/android-ndk-10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
-EAPI=5
-HOMEPAGE=https://developer.android.com/ndk/
-IUSE=+target-32 target-64
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
-RESTRICT=mirror strip installsources test
-SLOT=0
-SRC_URI=x86? ( target-32? ( https://dl.google.com/android/ndk/android-ndk32-r10-linux-x86.tar.bz2 ) target-64? ( https://dl.google.com/android/ndk/android-ndk64-r10-linux-x86.tar.bz2 ) ) amd64? ( target-32? ( https://dl.google.com/android/ndk/android-ndk32-r10-linux-x86_64.tar.bz2 ) target-64? ( https://dl.google.com/android/ndk/android-ndk64-r10-linux-x86_64.tar.bz2 ) )
-_md5_=9663a2911d59a930e6200231e63b7c55
diff --git a/metadata/md5-cache/dev-util/android-ndk-10b b/metadata/md5-cache/dev-util/android-ndk-10b
deleted file mode 100644
index 1f527dd240d9..000000000000
--- a/metadata/md5-cache/dev-util/android-ndk-10b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
-EAPI=5
-HOMEPAGE=https://developer.android.com/ndk/
-IUSE=+target-32 target-64
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
-RESTRICT=mirror strip installsources test
-SLOT=0
-SRC_URI=x86? ( target-32? ( https://dl.google.com/android/ndk/android-ndk32-r10b-linux-x86.tar.bz2 ) target-64? ( https://dl.google.com/android/ndk/android-ndk64-r10b-linux-x86.tar.bz2 ) ) amd64? ( target-32? ( https://dl.google.com/android/ndk/android-ndk32-r10b-linux-x86_64.tar.bz2 ) target-64? ( https://dl.google.com/android/ndk/android-ndk64-r10b-linux-x86_64.tar.bz2 ) )
-_md5_=9663a2911d59a930e6200231e63b7c55
diff --git a/metadata/md5-cache/dev-util/android-ndk-10d b/metadata/md5-cache/dev-util/android-ndk-10d
deleted file mode 100644
index 25c834a7c033..000000000000
--- a/metadata/md5-cache/dev-util/android-ndk-10d
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-arch/p7zip
-DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
-EAPI=5
-HOMEPAGE=https://developer.android.com/ndk/
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
-RESTRICT=mirror strip installsources test
-SLOT=0
-SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r10d-linux-x86.bin -> android-ndk-10d-x86.7z ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin -> android-ndk-10d-amd64.7z )
-_md5_=41b610d1e8ae3f53645da465ad943611
diff --git a/metadata/md5-cache/dev-util/android-ndk-10e b/metadata/md5-cache/dev-util/android-ndk-10e
deleted file mode 100644
index 32619c127cd9..000000000000
--- a/metadata/md5-cache/dev-util/android-ndk-10e
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install pretend setup
-DEPEND=app-arch/p7zip
-DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
-EAPI=5
-HOMEPAGE=https://developer.android.com/ndk/
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 sys-libs/ncurses-compat:5
-RESTRICT=mirror strip installsources test
-SLOT=0
-SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin -> android-ndk-10e-x86.7z ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin -> android-ndk-10e-amd64.7z )
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d
-_md5_=a3a7cf03c15225ec3b2fbb73c068a76f
diff --git a/metadata/md5-cache/dev-util/android-ndk-9 b/metadata/md5-cache/dev-util/android-ndk-9
deleted file mode 100644
index bfa161ec0250..000000000000
--- a/metadata/md5-cache/dev-util/android-ndk-9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
-EAPI=5
-HOMEPAGE=https://developer.android.com/ndk/
-IUSE=legacy-toolchains
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
-RESTRICT=mirror strip installsources test
-SLOT=0
-SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r9-linux-x86.tar.bz2 legacy-toolchains? ( https://dl.google.com/android/ndk/android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2 ) ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 legacy-toolchains? ( https://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2 ) )
-_md5_=170a6899c885f1fc5c6ec9dfc1906a3c
diff --git a/metadata/md5-cache/dev-util/android-ndk-9b b/metadata/md5-cache/dev-util/android-ndk-9b
deleted file mode 100644
index 9269294aa1c1..000000000000
--- a/metadata/md5-cache/dev-util/android-ndk-9b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
-EAPI=5
-HOMEPAGE=https://developer.android.com/ndk/
-IUSE=legacy-toolchains
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
-RESTRICT=mirror strip installsources test
-SLOT=0
-SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2 legacy-toolchains? ( https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2 ) ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2 legacy-toolchains? ( https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2 ) )
-_md5_=170a6899c885f1fc5c6ec9dfc1906a3c
diff --git a/metadata/md5-cache/dev-util/android-ndk-9c b/metadata/md5-cache/dev-util/android-ndk-9c
deleted file mode 100644
index e8eabb2b0c42..000000000000
--- a/metadata/md5-cache/dev-util/android-ndk-9c
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
-EAPI=5
-HOMEPAGE=https://developer.android.com/ndk/
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
-RESTRICT=mirror strip installsources test
-SLOT=0
-SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r9c-linux-x86.tar.bz2 ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r9c-linux-x86_64.tar.bz2 )
-_md5_=c7c6cc3ec11a3ce9cf299249fe8d8077
diff --git a/metadata/md5-cache/dev-util/android-ndk-9d b/metadata/md5-cache/dev-util/android-ndk-9d
deleted file mode 100644
index caa2056f0fbd..000000000000
--- a/metadata/md5-cache/dev-util/android-ndk-9d
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
-EAPI=5
-HOMEPAGE=https://developer.android.com/ndk/
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
-RESTRICT=mirror strip installsources test
-SLOT=0
-SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r9d-linux-x86.tar.bz2 ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r9d-linux-x86_64.tar.bz2 )
-_md5_=c7c6cc3ec11a3ce9cf299249fe8d8077
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 72b80c016ad7..666fa6696d8e 100644
--- a/metadata/md5-cache/dev-util/aruba-1.0.3-r1
+++ b/metadata/md5-cache/dev-util/aruba-1.0.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=7
 HOMEPAGE=https://github.com/cucumber/aruba
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/childprocess-2.0[ruby_targets_ruby25(-)] <dev-ruby/childprocess-5[ruby_targets_ruby25(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby25(-)] >=dev-ruby/ffi-1.9[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby25(-)] dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby25(-)] <dev-util/cucumber-6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/childprocess-2.0[ruby_targets_ruby26(-)] <dev-ruby/childprocess-5[ruby_targets_ruby26(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby26(-)] >=dev-ruby/ffi-1.9[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby26(-)] <dev-util/cucumber-6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] >=dev-ruby/ffi-1.9[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-6[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ 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	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2a126f2a8e8292c9bc0ab538ede616d0
+_md5_=9a31e86174aad224dfa3370e3c119ef6
diff --git a/metadata/md5-cache/dev-util/babeltrace-1.2.3 b/metadata/md5-cache/dev-util/babeltrace-1.2.3
deleted file mode 100644
index 7105ebf445ca..000000000000
--- a/metadata/md5-cache/dev-util/babeltrace-1.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 dev-libs/popt sys-apps/util-linux sys-devel/bison sys-devel/flex
-DESCRIPTION=A command-line tool and library to read and convert trace files
-EAPI=5
-HOMEPAGE=https://lttng.org
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/popt sys-apps/util-linux
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://lttng.org/files/babeltrace/babeltrace-1.2.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=06d06fe8bb8d597872e86b516a9645c7
diff --git a/metadata/md5-cache/dev-util/cmake-3.19.1 b/metadata/md5-cache/dev-util/cmake-3.19.1
index dfc9c4e82e9f..1430b1042c43 100644
--- a/metadata/md5-cache/dev-util/cmake-3.19.1
+++ b/metadata/md5-cache/dev-util/cmake-3.19.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.19/cmake-3.19.1.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d1763fd79aed7fde640897321c0b553
+_md5_=8720662d78336db4ed3019a4c285e236
diff --git a/metadata/md5-cache/dev-util/cunit-2.1_p3 b/metadata/md5-cache/dev-util/cunit-2.1_p3
index d065087d4221..bd6abf84c984 100644
--- a/metadata/md5-cache/dev-util/cunit-2.1_p3
+++ b/metadata/md5-cache/dev-util/cunit-2.1_p3
@@ -5,10 +5,10 @@ DESCRIPTION=C Unit Test Framework
 EAPI=7
 HOMEPAGE=http://cunit.sourceforge.net
 IUSE=ncurses 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2
 RDEPEND=ncurses? ( >=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(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cunit/CUnit-2.1-3.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1bc7036142002e3367214311af081d3f
+_md5_=e16bf56f6096c5935853c0a16429a8c5
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.26 b/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
similarity index 76%
rename from metadata/md5-cache/dev-util/desktop-file-utils-0.26
rename to metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
index 5d804d201b54..16ecaa558c6f 100644
--- a/metadata/md5-cache/dev-util/desktop-file-utils-0.26
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
@@ -1,14 +1,14 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+BDEPEND=app-arch/xz-utils virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/glib-2.12:2 emacs? ( >=app-editors/emacs-23.1:* )
+DEPEND=>=dev-libs/glib-2.12:2
 DESCRIPTION=Command line utilities to work with desktop menu entries
 EAPI=7
 HOMEPAGE=https://freedesktop.org/wiki/Software/desktop-file-utils
 IUSE=emacs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.12:2 emacs? ( >=app-editors/emacs-23.1:* )
+RDEPEND=>=dev-libs/glib-2.12:2
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.26.tar.xz
 _eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=73e85f22f127d69c88157ad0fd6ef553
+_md5_=d327a5f9d6103f005b5f9569aa9ca79f
diff --git a/metadata/md5-cache/dev-util/diffoscope-161 b/metadata/md5-cache/dev-util/diffoscope-161
deleted file mode 100644
index bbe25a380707..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-161
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-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 gzip haskell hdf5 hex imagemagick iso java llvm mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar tcpdump xz zip zstd python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libarchive-c[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/distro[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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 ) gzip? ( app-arch/gzip ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( virtual/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) 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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) 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 ) xz? ( app-arch/xz-utils ) zip? ( app-arch/unzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-161.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=922f9400172213e7d3bf968f201c7131
diff --git a/metadata/md5-cache/dev-util/dropwatch-1.4-r1 b/metadata/md5-cache/dev-util/dropwatch-1.4-r1
deleted file mode 100644
index b5acfa4f2196..000000000000
--- a/metadata/md5-cache/dev-util/dropwatch-1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=dev-libs/libnl:3 sys-libs/binutils-libs sys-libs/readline:= virtual/pkgconfig
-DESCRIPTION=A utility to interface to the kernel to monitor for dropped network packets
-EAPI=5
-HOMEPAGE=https://fedorahosted.org/dropwatch/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libnl:3 sys-libs/binutils-libs sys-libs/readline:=
-SLOT=0
-SRC_URI=https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-1.4.tbz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7710b057f84563a344fb1e3528a999ac
diff --git a/metadata/md5-cache/dev-util/kyua-0.13-r2 b/metadata/md5-cache/dev-util/kyua-0.13-r2
index 8f38321887ff..6df7dcb440e2 100644
--- a/metadata/md5-cache/dev-util/kyua-0.13-r2
+++ b/metadata/md5-cache/dev-util/kyua-0.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Testing framework for infrastructure software
 EAPI=6
 HOMEPAGE=https://github.com/jmmv/kyua
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-db/sqlite:3 dev-libs/atf dev-lua/lutok
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jmmv/kyua/releases/download/kyua-0.13/kyua-0.13.tar.gz
-_md5_=290a189d6ea07b6fcff84c6b41a07093
+_md5_=0211b65ce83e2b019fb872d3d901f15c
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.0 b/metadata/md5-cache/dev-util/lldb-10.0.0
deleted file mode 100644
index 6e50a8ba3334..000000000000
--- a/metadata/md5-cache/dev-util/lldb-10.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_6? ( ~dev-python/lit-10.0.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( ~dev-python/lit-10.0.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( ~dev-python/lit-10.0.0[python_targets_python3_8(-)] ) sys-devel/lld ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ~sys-devel/clang-10.0.0[xml] ~sys-devel/llvm-10.0.0 !<sys-devel/llvm-4.0 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM debugger
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=libedit lzma ncurses +python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ~sys-devel/clang-10.0.0[xml] ~sys-devel/llvm-10.0.0 !<sys-devel/llvm-4.0
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e0ca033cd4a9a80aa6aeadc5583424e
diff --git a/metadata/md5-cache/dev-util/lldb-11.0.0.9999 b/metadata/md5-cache/dev-util/lldb-11.0.0.9999
index 91836fde049e..a06309c4ef9a 100644
--- a/metadata/md5-cache/dev-util/lldb-11.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-11.0.0.9999
@@ -4,12 +4,12 @@ DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? (
 DESCRIPTION=The LLVM debugger
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=libedit lzma ncurses +python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=libedit lzma ncurses +python test test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) ) ~sys-devel/clang-11.0.0.9999[xml] ~sys-devel/llvm-11.0.0.9999 !<sys-devel/llvm-4.0
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c88c49c9c7e99b53a950dd6a0533b35b
+_md5_=1260e6595ba9ffda0ada925e599c90fa
diff --git a/metadata/md5-cache/dev-util/lldb-12.0.0.9999 b/metadata/md5-cache/dev-util/lldb-12.0.0.9999
index 0c37b267e1e8..8317adaf33d1 100644
--- a/metadata/md5-cache/dev-util/lldb-12.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-12.0.0.9999
@@ -4,12 +4,12 @@ DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? (
 DESCRIPTION=The LLVM debugger
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=libedit lzma ncurses +python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=libedit lzma ncurses +python test test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) ) ~sys-devel/clang-12.0.0.9999[xml] ~sys-devel/llvm-12.0.0.9999 !<sys-devel/llvm-4.0
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
+RESTRICT=test !test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f371916ad42f8ffa1c7ac89177966c5
+_md5_=131ff16cee92351a9859ecd8c798b5f7
diff --git a/metadata/md5-cache/dev-util/peg-0.1.15-r1 b/metadata/md5-cache/dev-util/peg-0.1.15-r1
deleted file mode 100644
index 09f9e95ac057..000000000000
--- a/metadata/md5-cache/dev-util/peg-0.1.15-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DESCRIPTION=Recursive-descent parser generators for C
-EAPI=5
-HOMEPAGE=http://piumarta.com/software/peg/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=http://piumarta.com/software/peg/peg-0.1.15.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6acb70998c965145cf0f0de63b43b312
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.7.7 b/metadata/md5-cache/dev-util/pkgcheck-0.7.7
index a6d143a07965..29affdde2ddc 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.7.7
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.7.7
@@ -4,7 +4,7 @@ DESCRIPTION=pkgcore-based QA utility for ebuild repos
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/snakeoil-0.8.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.10.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.7.7.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e0f93b794eb2d30a20bc3938132431f
+_md5_=b51c84c8f9487b81c516c119aec88e60
diff --git a/metadata/md5-cache/dev-util/rebar-2.6.4 b/metadata/md5-cache/dev-util/rebar-2.6.4
deleted file mode 100644
index b9321a20bad1..000000000000
--- a/metadata/md5-cache/dev-util/rebar-2.6.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/erlang:=
-DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
-EAPI=5
-HOMEPAGE=https://github.com/rebar/rebar
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/rebar/rebar/archive/2.6.4.tar.gz -> rebar-2.6.4.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cadd56a9dcef25b93d2787f81369bc6b
diff --git a/metadata/md5-cache/dev-util/rustup-1.23.0 b/metadata/md5-cache/dev-util/rustup-1.23.0
new file mode 100644
index 000000000000..3c41e444012d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rustup-1.23.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/rust >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install postinst test unpack
+DEPEND=app-arch/xz-utils net-misc/curl:=[http2,ssl] dev-libs/openssl:0=
+DESCRIPTION=Rust toolchain installer
+EAPI=7
+HOMEPAGE=https://rust-lang.github.io/rustup/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB
+RDEPEND=app-arch/xz-utils net-misc/curl:=[http2,ssl] dev-libs/openssl:0=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rust-lang/rustup/archive/1.23.0.tar.gz -> rustup-1.23.0.tar.gz https://github.com/rbtcollins/home/archive/a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz -> home-a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz https://crates.io/api/v1/crates/addr2line/0.13.0/download -> addr2line-0.13.0.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aes/0.5.0/download -> aes-0.5.0.crate https://crates.io/api/v1/crates/aesni/0.8.0/download -> aesni-0.8.0.crate https://crates.io/api/v1/crates/aes-soft/0.5.0/download -> aes-soft-0.5.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.14/download -> aho-corasick-0.7.14.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.33/download -> anyhow-1.0.33.crate https://crates.io/api/v1/crates/async-compression/0.3.5/download -> async-compression-0.3.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/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.53/download -> backtrace-0.3.53.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/bitfield/0.13.2/download -> bitfield-0.13.2.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.7.3/download -> block-buffer-0.7.3.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-cipher/0.8.0/download -> block-cipher-0.8.0.crate https://crates.io/api/v1/crates/block-modes/0.6.1/download -> block-modes-0.6.1.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.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/blowfish/0.6.0/download -> blowfish-0.6.0.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/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/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/cast5/0.8.0/download -> cast5-0.8.0.crate https://crates.io/api/v1/crates/cc/1.0.61/download -> cc-1.0.61.crate https://crates.io/api/v1/crates/cfb-mode/0.5.0/download -> cfb-mode-0.5.0.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/circular/0.3.0/download -> circular-0.3.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/clear_on_drop/0.2.4/download -> clear_on_drop-0.2.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-sys/0.7.0/download -> core-foundation-sys-0.7.0.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/crc24/0.1.6/download -> crc24-0.1.6.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.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-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/curl/0.4.34/download -> curl-0.4.34.crate https://crates.io/api/v1/crates/curl-sys/0.4.38+curl-7.73.0/download -> curl-sys-0.4.38+curl-7.73.0.crate https://crates.io/api/v1/crates/curve25519-dalek/3.0.0/download -> curve25519-dalek-3.0.0.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/derive_builder/0.9.0/download -> derive_builder-0.9.0.crate https://crates.io/api/v1/crates/derive_builder_core/0.9.0/download -> derive_builder_core-0.9.0.crate https://crates.io/api/v1/crates/des/0.5.0/download -> des-0.5.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/ed25519/1.0.3/download -> ed25519-1.0.3.crate https://crates.io/api/v1/crates/ed25519-dalek/1.0.1/download -> ed25519-dalek-1.0.1.crate https://crates.io/api/v1/crates/effective-limits/0.5.2/download -> effective-limits-0.5.2.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.24/download -> encoding_rs-0.8.24.crate https://crates.io/api/v1/crates/env_proxy/0.4.1/download -> env_proxy-0.4.1.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/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/filetime/0.2.12/download -> filetime-0.2.12.crate https://crates.io/api/v1/crates/flate2/1.0.18/download -> flate2-1.0.18.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/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.3.6/download -> futures-0.3.6.crate https://crates.io/api/v1/crates/futures-channel/0.3.6/download -> futures-channel-0.3.6.crate https://crates.io/api/v1/crates/futures-core/0.3.6/download -> futures-core-0.3.6.crate https://crates.io/api/v1/crates/futures-executor/0.3.6/download -> futures-executor-0.3.6.crate https://crates.io/api/v1/crates/futures-io/0.3.6/download -> futures-io-0.3.6.crate https://crates.io/api/v1/crates/futures-macro/0.3.6/download -> futures-macro-0.3.6.crate https://crates.io/api/v1/crates/futures-sink/0.3.6/download -> futures-sink-0.3.6.crate https://crates.io/api/v1/crates/futures-task/0.3.6/download -> futures-task-0.3.6.crate https://crates.io/api/v1/crates/futures-util/0.3.6/download -> futures-util-0.3.6.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.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.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/gimli/0.22.0/download -> gimli-0.22.0.crate https://crates.io/api/v1/crates/git-testament/0.1.9/download -> git-testament-0.1.9.crate https://crates.io/api/v1/crates/git-testament-derive/0.1.10/download -> git-testament-derive-0.1.10.crate https://crates.io/api/v1/crates/h2/0.2.6/download -> h2-0.2.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.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/hex/0.4.2/download -> hex-0.4.2.crate https://crates.io/api/v1/crates/http/0.2.1/download -> http-0.2.1.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.3.1/download -> http-body-0.3.1.crate https://crates.io/api/v1/crates/httpdate/0.3.2/download -> httpdate-0.3.2.crate https://crates.io/api/v1/crates/hyper/0.13.8/download -> hyper-0.13.8.crate https://crates.io/api/v1/crates/hyper-tls/0.4.3/download -> hyper-tls-0.4.3.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.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.0/download -> indexmap-1.6.0.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.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.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/js-sys/0.3.45/download -> js-sys-0.3.45.crate https://crates.io/api/v1/crates/keccak/0.1.0/download -> keccak-0.1.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.79/download -> libc-0.2.79.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/lzma-sys/0.1.17/download -> lzma-sys-0.1.17.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.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/md-5/0.9.1/download -> md-5-0.9.1.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.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.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.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.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.4/download -> native-tls-0.2.4.crate https://crates.io/api/v1/crates/net2/0.2.35/download -> net2-0.2.35.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.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-bigint-dig/0.6.0/download -> num-bigint-dig-0.6.0.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-derive/0.3.2/download -> num-derive-0.3.2.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-iter/0.1.41/download -> num-iter-0.1.41.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/object/0.21.1/download -> object-0.21.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/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.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/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.30/download -> openssl-0.10.30.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-src/111.12.0+1.1.1h/download -> openssl-src-111.12.0+1.1.1h.crate https://crates.io/api/v1/crates/openssl-sys/0.9.58/download -> openssl-sys-0.9.58.crate https://crates.io/api/v1/crates/pem/0.8.1/download -> pem-0.8.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/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/pgp/0.7.1/download -> pgp-0.7.1.crate https://crates.io/api/v1/crates/pin-project/0.4.27/download -> pin-project-0.4.27.crate https://crates.io/api/v1/crates/pin-project-internal/0.4.27/download -> pin-project-internal-0.4.27.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.10/download -> pin-project-lite-0.1.10.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/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.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.18/download -> proc-macro-hack-0.5.18.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/pulldown-cmark/0.8.0/download -> pulldown-cmark-0.8.0.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.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.2.2/download -> rand_chacha-0.2.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.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rayon/1.4.1/download -> rayon-1.4.1.crate https://crates.io/api/v1/crates/rayon-core/1.8.1/download -> rayon-core-1.8.1.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/regex/1.4.1/download -> regex-1.4.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.20/download -> regex-syntax-0.6.20.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/remove_dir_all/0.6.1/download -> remove_dir_all-0.6.1.crate https://crates.io/api/v1/crates/reqwest/0.10.8/download -> reqwest-0.10.8.crate https://crates.io/api/v1/crates/retry/1.1.0/download -> retry-1.1.0.crate https://crates.io/api/v1/crates/ripemd160/0.9.1/download -> ripemd160-0.9.1.crate https://crates.io/api/v1/crates/rsa/0.3.0/download -> rsa-0.3.0.crate https://crates.io/api/v1/crates/rs_tracing/1.0.1/download -> rs_tracing-1.0.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.17/download -> rustc-demangle-0.1.17.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/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.0/download -> semver-parser-0.10.0.crate https://crates.io/api/v1/crates/serde/1.0.117/download -> serde-1.0.117.crate https://crates.io/api/v1/crates/serde_derive/1.0.117/download -> serde_derive-1.0.117.crate https://crates.io/api/v1/crates/serde_json/1.0.59/download -> serde_json-1.0.59.crate https://crates.io/api/v1/crates/serde_urlencoded/0.6.1/download -> serde_urlencoded-0.6.1.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/sha-1/0.9.1/download -> sha-1-0.9.1.crate https://crates.io/api/v1/crates/sha2/0.9.1/download -> sha2-0.9.1.crate https://crates.io/api/v1/crates/sha3/0.9.1/download -> sha3-0.9.1.crate https://crates.io/api/v1/crates/signature/1.2.2/download -> signature-1.2.2.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/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.2/download -> smallvec-1.4.2.crate https://crates.io/api/v1/crates/socket2/0.3.15/download -> socket2-0.3.15.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/stream-cipher/0.7.1/download -> stream-cipher-0.7.1.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/subtle/2.3.0/download -> subtle-2.3.0.crate https://crates.io/api/v1/crates/syn/1.0.45/download -> syn-1.0.45.crate https://crates.io/api/v1/crates/synstructure/0.12.4/download -> synstructure-0.12.4.crate https://crates.io/api/v1/crates/sys-info/0.6.1/download -> sys-info-0.6.1.crate https://crates.io/api/v1/crates/tar/0.4.30/download -> tar-0.4.30.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.1/download -> term-0.5.1.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.21/download -> thiserror-1.0.21.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.21/download -> thiserror-impl-1.0.21.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/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/tinyvec/0.3.4/download -> tinyvec-0.3.4.crate https://crates.io/api/v1/crates/tokio/0.2.22/download -> tokio-0.2.22.crate https://crates.io/api/v1/crates/tokio-socks/0.2.2/download -> tokio-socks-0.2.2.crate https://crates.io/api/v1/crates/tokio-tls/0.3.1/download -> tokio-tls-0.3.1.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.7/download -> toml-0.5.7.crate https://crates.io/api/v1/crates/tower-service/0.3.0/download -> tower-service-0.3.0.crate https://crates.io/api/v1/crates/tracing/0.1.21/download -> tracing-0.1.21.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/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/twofish/0.4.0/download -> twofish-0.4.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.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.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.13/download -> unicode-normalization-0.1.13.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/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.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/wait-timeout/0.2.0/download -> wait-timeout-0.2.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.3.0/download -> want-0.3.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.68/download -> wasm-bindgen-0.2.68.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.68/download -> wasm-bindgen-backend-0.2.68.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.18/download -> wasm-bindgen-futures-0.4.18.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.68/download -> wasm-bindgen-macro-0.2.68.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.68/download -> wasm-bindgen-macro-support-0.2.68.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.68/download -> wasm-bindgen-shared-0.2.68.crate https://crates.io/api/v1/crates/web-sys/0.3.45/download -> web-sys-0.3.45.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.7.0/download -> winreg-0.7.0.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/x25519-dalek/1.1.0/download -> x25519-dalek-1.1.0.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/xz2/0.1.6/download -> xz2-0.1.6.crate https://crates.io/api/v1/crates/zeroize/1.1.1/download -> zeroize-1.1.1.crate https://crates.io/api/v1/crates/zeroize_derive/1.0.1/download -> zeroize_derive-1.0.1.crate
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	7ffdd252643addc68abff0a08cca5306	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b2c90d78db577886d48bcd53d6f305de
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 1264f4f4c66c..55ed4cdd60c5 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.10.3 b/metadata/md5-cache/games-emulation/ppsspp-1.10.3
new file mode 100644
index 000000000000..ee01435b5538
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.10.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:= sys-libs/zlib:= virtual/opengl sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( media-video/ffmpeg:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A PSP emulator written in C++
+EAPI=7
+HOMEPAGE=https://www.ppsspp.org/
+IUSE=qt5 sdl +system-ffmpeg
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=app-arch/snappy:= dev-libs/libzip:= dev-util/glslang:= media-libs/glew:= sys-libs/zlib:= virtual/opengl sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( media-video/ffmpeg:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] )
+REQUIRED_USE=!qt5? ( sdl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.10.3.tar.gz -> ppsspp-1.10.3.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz -> ppsspp-1.10.3-ext_SPIRV-Cross.tar.gz https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ppsspp-1.10.3-ext_armips.tar.gz https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ppsspp-1.10.3-ext_rapidjson.tar.gz https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz -> ppsspp-1.10.3-ext_discord-rpc.tar.gz https://github.com/hrydgard/glslang/archive/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz -> ppsspp-1.10.3-ext_glslang.tar.gz https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ppsspp-1.10.3-ext_native_tools_prebuilt.tar.gz https://github.com/hrydgard/ppsspp-lang/archive/fd6f5bc01afb419eacca538b425c01eb2a055393.tar.gz -> ppsspp-1.10.3-assets_lang.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/d3e695286cce346274192c214c00f021c00cd575.tar.gz -> ppsspp-1.10.3-ffmpeg.tar.gz )
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9d14d139f67bf03e1153a0216dbd861
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.5.4-r2 b/metadata/md5-cache/games-emulation/ppsspp-1.5.4-r2
deleted file mode 100644
index e2320231180a..000000000000
--- a/metadata/md5-cache/games-emulation/ppsspp-1.5.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-arch/snappy:= dev-libs/libzip:= media-libs/glew:= sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 !sdl? ( dev-qt/qtmultimedia:5 ) ) sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( media-video/ffmpeg:= ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A PSP emulator written in C++
-EAPI=6
-HOMEPAGE=https://www.ppsspp.org/
-IUSE=headless +qt5 sdl +system-ffmpeg
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/snappy:= dev-libs/libzip:= media-libs/glew:= sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 !sdl? ( dev-qt/qtmultimedia:5 ) ) sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( media-video/ffmpeg:= )
-REQUIRED_USE=!qt5? ( sdl )
-SLOT=0
-SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.5.4.tar.gz -> ppsspp-1.5.4.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ppsspp-1.5.4-ffmpeg.tar.gz ) https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz -> ppsspp-1.5.4-assets_lang.tar.gz https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz -> ppsspp-1.5.4-pspautotests.tar.gz https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ppsspp-1.5.4-dx9sdk.tar.gz https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz -> ppsspp-1.5.4-ext_glslang.tar.gz https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz -> ppsspp-1.5.4-ext_armips.tar.gz https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ppsspp-1.5.4-ext_armips_ext_tinyformat.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz -> ppsspp-1.5.4-ext_SPIRV-Cross.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92415e0a599282e5be12eff87ee6c2bb
diff --git a/metadata/md5-cache/games-emulation/ppsspp-9999 b/metadata/md5-cache/games-emulation/ppsspp-9999
deleted file mode 100644
index 79e02edd8437..000000000000
--- a/metadata/md5-cache/games-emulation/ppsspp-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-arch/snappy:= dev-libs/libzip:= media-libs/glew:= sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 !sdl? ( dev-qt/qtmultimedia:5 ) ) sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( media-video/ffmpeg:= ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A PSP emulator written in C++
-EAPI=6
-HOMEPAGE=https://www.ppsspp.org/
-IUSE=headless +qt5 sdl +system-ffmpeg
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=app-arch/snappy:= dev-libs/libzip:= media-libs/glew:= sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 !sdl? ( dev-qt/qtmultimedia:5 ) ) sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( media-video/ffmpeg:= )
-REQUIRED_USE=!qt5? ( sdl )
-SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb42a3d52b3916b2397525ad43cce2d3
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index d6290f6971b1..5be5f549f0d5 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/dMagnetic-0.27 b/metadata/md5-cache/games-engines/dMagnetic-0.28
similarity index 86%
rename from metadata/md5-cache/games-engines/dMagnetic-0.27
rename to metadata/md5-cache/games-engines/dMagnetic-0.28
index 20dcd57f491a..9b44813b183e 100644
--- a/metadata/md5-cache/games-engines/dMagnetic-0.27
+++ b/metadata/md5-cache/games-engines/dMagnetic-0.28
@@ -5,6 +5,6 @@ HOMEPAGE=https://www.dettus.net/dMagnetic/
 KEYWORDS=~amd64 ~arm ~m68k ~x86
 LICENSE=BSD-2
 SLOT=0
-SRC_URI=https://www.dettus.net/dMagnetic/dMagnetic_0.27.tar.bz2
+SRC_URI=https://www.dettus.net/dMagnetic/dMagnetic_0.28.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=edfcab7a7b14a79b3e4c45dff4020bbc
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index c5b7f760f297..4bce67742eba 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/roundcube-1.4.9 b/metadata/md5-cache/mail-client/roundcube-1.4.9
new file mode 100644
index 000000000000..e69e8275001e
--- /dev/null
+++ b/metadata/md5-cache/mail-client/roundcube-1.4.9
@@ -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=A browser-based multilingual IMAP client with an application-like user interface
+EAPI=6
+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
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=1.4.9
+SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.4.9/roundcubemail-1.4.9-complete.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=30d8e4e246ef7cb6fb1a7f21a74f34ff
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 1273841f5742..df8f8d4bb28c 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.12 b/metadata/md5-cache/mail-mta/msmtp-1.8.12
index 32ff3867c8eb..33e75a885038 100644
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.12
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.12
@@ -5,11 +5,11 @@ DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
 EAPI=7
 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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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] ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=daemon? ( filecaps )
 SLOT=0
 SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.12.tar.xz
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ed85e648219c511133887622287995b
+_md5_=a652427359370c30c421f846d6709aae
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 97fd5f3d1672..036249398194 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.6 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.6
index 9a255c2447e2..67737d2cbbc0 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.6
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.6
@@ -11,4 +11,4 @@ RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.5 ) java?
 SLOT=0/0.2
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.0.6.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e42f9457823075613349b358171f2d5
+_md5_=27c819e4cfe530172ada6b16794c0fa6
diff --git a/metadata/md5-cache/media-libs/shaderc-2018.0 b/metadata/md5-cache/media-libs/shaderc-2018.0
deleted file mode 100644
index 27535f937720..000000000000
--- a/metadata/md5-cache/media-libs/shaderc-2018.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/glslang-7.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-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(-)?] || ( dev-lang/python:3.6 ) dev-util/spirv-headers doc? ( dev-ruby/asciidoctor ) test? ( dev-cpp/gtest || ( ( dev-lang/python:3.6 dev-python/nose[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Collection of tools, libraries and tests for shader compilation
-EAPI=6
-HOMEPAGE=https://github.com/google/shaderc
-IUSE=doc 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 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-util/glslang-7.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-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(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/shaderc/archive/v2018.0.tar.gz -> shaderc-2018.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef0fdaedcea72c0734c6a0e406c48749
diff --git a/metadata/md5-cache/media-libs/shaderc-2019.0-r1 b/metadata/md5-cache/media-libs/shaderc-2019.0-r1
deleted file mode 100644
index e20dfaa79dfe..000000000000
--- a/metadata/md5-cache/media-libs/shaderc-2019.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/glslang-7.12.3353_pre20191027-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(-)?] >=dev-util/spirv-tools-2019.10_pre20191027[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-lang/python:3.7 dev-lang/python:3.6 ) >=dev-util/spirv-headers-1.5.1 doc? ( dev-ruby/asciidoctor ) test? ( dev-cpp/gtest || ( ( dev-lang/python:3.7 dev-python/nose[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/nose[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Collection of tools, libraries and tests for shader compilation
-EAPI=6
-HOMEPAGE=https://github.com/google/shaderc
-IUSE=doc 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 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-util/glslang-7.12.3353_pre20191027-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(-)?] >=dev-util/spirv-tools-2019.10_pre20191027[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
-SRC_URI=https://github.com/google/shaderc/archive/v2019.0.tar.gz -> shaderc-2019.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ee48612a7dc4263d0496a6814b0482c
diff --git a/metadata/md5-cache/media-libs/shaderc-2020.1 b/metadata/md5-cache/media-libs/shaderc-2020.1
deleted file mode 100644
index b8c14bb8383b..000000000000
--- a/metadata/md5-cache/media-libs/shaderc-2020.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/glslang-8.13.3560_pre20200404[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-tools-2020.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(-)?] || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=dev-util/spirv-headers-1.5.3 doc? ( dev-ruby/asciidoctor ) test? ( dev-cpp/gtest || ( ( dev-lang/python:3.8 dev-python/nose[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/nose[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/nose[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Collection of tools, libraries and tests for shader compilation
-EAPI=6
-HOMEPAGE=https://github.com/google/shaderc
-IUSE=doc 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 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-util/glslang-8.13.3560_pre20200404[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-tools-2020.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(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/shaderc/archive/v2020.1.tar.gz -> shaderc-2020.1.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7bb50f9df6d19786431c4deb03ce809a
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index d9c05fbf1a7d..8c16766f4700 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/hydrogen-9999 b/metadata/md5-cache/media-sound/hydrogen-9999
index 9f3acd1a7cc0..fd395351f5a6 100644
--- a/metadata/md5-cache/media-sound/hydrogen-9999
+++ b/metadata/md5-cache/media-sound/hydrogen-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1fe34e31075f0884fd81a5cff3425d8
+_md5_=b3fb02fe7e3e45b69c1306dd50e0555b
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 48b266db0724..6c1a40a63c43 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/w_scan-20170107 b/metadata/md5-cache/media-tv/w_scan-20170107
index 41679f407048..79d1695658ae 100644
--- a/metadata/md5-cache/media-tv/w_scan-20170107
+++ b/metadata/md5-cache/media-tv/w_scan-20170107
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
 DEPEND=>=virtual/linuxtv-dvb-headers-5.8
 DESCRIPTION=Scan DVB-C/DVB-T/DVB-S channels
-EAPI=5
+EAPI=7
 HOMEPAGE=http://wirbel.htpc-forum.de/w_scan/index2.html
 IUSE=doc examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/w_scan/w_scan-20170107.tar.bz2
-_md5_=ac976bb27b32db25215f1920f1751f4f
+_md5_=7c98c5859cb1d57109c94c2bfac6fce5
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 946478583e08..ee8d789e6b3a 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.3.1 b/metadata/md5-cache/media-video/ffmpeg-4.3.1
index 105c812cc49f..61da13f3e1ce 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.3.1
+++ b/metadata/md5-cache/media-video/ffmpeg-4.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
 IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 rav1e snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher 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 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) amr? ( >=media-libs/opencore-amr-0.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(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.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(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.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(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.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(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.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-sound/lame-3.99.5-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(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-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(-)?] ) rav1e? ( media-video/rav1e:=[capi] ) snappy? ( >=app-arch/snappy-1.1.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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,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/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(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.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(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.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(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[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-1.6: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(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.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(-)?] ) gmp? ( >=dev-libs/gmp-6: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(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-0-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(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-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(-)?] >=sys-libs/libraw1394-2.1.0-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(-)?] >=sys-libs/libavc1394-0.5.4-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(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.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(-)?] >=sys-libs/libraw1394-2.1.0-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(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2: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(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-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(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-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(-)?] ) libass? ( >=media-libs/libass-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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.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(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-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(-)?] ) libv4l? ( >=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(-)?] ) libxml2? ( 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(-)?] ) lv2? ( media-libs/lv2[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/lilv[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-5.0.5-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(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-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(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) 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-7.0-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(-)?] ) opus? ( >=media-libs/opus-1.0.2-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.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(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.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(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,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[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) srt? ( >=net-libs/srt-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.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(-)?] ) svg? ( gnome-base/librsvg: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(-)?] ) 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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.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(-)?] ) vidstab? ( >=media-libs/vidstab-1.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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.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(-)?] >=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(-)?] ) vpx? ( >=media-libs/libvpx-1.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(-)?] ) vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.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/libXext-1.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(-)?] >=x11-libs/libXv-1.0.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(-)?] >=x11-libs/libxcb-1.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(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.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(-)?] ) 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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl: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(-)?] ) !libressl? ( openssl? ( >=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(-)?] ) !openssl? ( 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(-)?] ) ) )
 REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) vidstab? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl?
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.3.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1974d9b7004ee9c74a1a73409198cf79
+_md5_=7e47fe80bd4e3c844f1f4f711ce11968
diff --git a/metadata/md5-cache/media-video/mplayer-1.4-r1 b/metadata/md5-cache/media-video/mplayer-1.4-r1
index 6c36e6a0bff7..862bad04275e 100644
--- a/metadata/md5-cache/media-video/mplayer-1.4-r1
+++ b/metadata/md5-cache/media-video/mplayer-1.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Media Player for Linux
 EAPI=6
 HOMEPAGE=http://www.mplayerhq.hu/
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran video_cards_mga
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-4.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:0= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
@@ -12,4 +12,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=mirror://mplayer/releases/MPlayer-1.4.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3b210252717f9531c47dfc5096ffc639
+_md5_=5d0d1a98a874a3649c9a4d35b7fac2da
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.17 b/metadata/md5-cache/media-video/pipewire-0.3.17
new file mode 100644
index 000000000000..d922ff36b225
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.17
@@ -0,0 +1,15 @@
+BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 ) vulkan? ( dev-util/vulkan-headers )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.17.tar.gz -> pipewire-0.3.17.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4e6a602a1070a0a1684e25a568b6fd3e
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index fb690c005444..e5a0de516faa 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/c-ares-1.17.1 b/metadata/md5-cache/net-dns/c-ares-1.17.1
index 19ce25a6781c..736149865f3f 100644
--- a/metadata/md5-cache/net-dns/c-ares-1.17.1
+++ b/metadata/md5-cache/net-dns/c-ares-1.17.1
@@ -4,9 +4,9 @@ DESCRIPTION=C library that resolves names asynchronously
 EAPI=7
 HOMEPAGE=https://c-ares.haxx.se/
 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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris
 LICENSE=MIT
 SLOT=0/2
 SRC_URI=https://c-ares.haxx.se/download/c-ares-1.17.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=13d9c2368a8a07bbe1a46d7c6a6ca348
+_md5_=00486774aa393037d3e7877c28fba062
diff --git a/metadata/md5-cache/net-dns/idnkit-2.3 b/metadata/md5-cache/net-dns/idnkit-2.3
index 044df1d36829..ce94f24ec720 100644
--- a/metadata/md5-cache/net-dns/idnkit-2.3
+++ b/metadata/md5-cache/net-dns/idnkit-2.3
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit for Internationalized Domain Names (IDN)
 EAPI=6
 HOMEPAGE=https://jprs.co.jp/idn/
 IUSE=liteonly static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=JPRS
 RDEPEND=virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=https://jprs.co.jp/idn/idnkit-2.3.tar.bz2
 _eclasses_=ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ee77f3e4122a956be2addb0cebb3259e
+_md5_=1a7ba77dd6f212ed1a0b6900d4ba7998
diff --git a/metadata/md5-cache/net-dns/ldns-utils-1.7.1 b/metadata/md5-cache/net-dns/ldns-utils-1.7.1
index 9dcf51f67ac9..c2a0e11a7f06 100644
--- a/metadata/md5-cache/net-dns/ldns-utils-1.7.1
+++ b/metadata/md5-cache/net-dns/ldns-utils-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Set of utilities to simplify various dns(sec) tasks
 EAPI=6
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
 IUSE=+dane ecdsa ed25519 ed448 examples gost ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=net-libs/ldns-1.7.1[dane?,ecdsa?,ed25519?,ed448?,gost?] examples? ( net-libs/libpcap )
 REQUIRED_USE=ecdsa? ( ssl ) ed25519? ( ssl ) ed448? ( ssl ) dane? ( ssl ) gost? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz
-_md5_=e01817e466c1aed47623230e84209508
+_md5_=bd9e0bc982c877b5ec1b34fdc1820c2e
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index a9b992d7d4ac..6098088d37f2 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1 b/metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1
index c7f5cf3fc669..83b23f8988e5 100644
--- a/metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1
+++ b/metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/fddl sys-devel/bison sys-devel/flex
 DESCRIPTION=Iptables policy testing and validation tool
 EAPI=7
 HOMEPAGE=http://itval.sourceforge.net
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/fddl
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/ITVal-20121104.tar.bz2
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bdc58e4827fd8b562d54c77ad9b9af86
+_md5_=10b22973e41766a95edeeff74a06f5e2
diff --git a/metadata/md5-cache/net-firewall/psad-2.4.6 b/metadata/md5-cache/net-firewall/psad-2.4.6
index 7c0210a542af..0553e8dbf9e3 100644
--- a/metadata/md5-cache/net-firewall/psad-2.4.6
+++ b/metadata/md5-cache/net-firewall/psad-2.4.6
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=Port Scanning Attack Detection daemon
 EAPI=6
 HOMEPAGE=https://www.cipherdyne.org/psad/
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Bit-Vector dev-perl/Date-Calc dev-perl/NetAddr-IP dev-perl/Unix-Syslog net-firewall/iptables net-misc/whois virtual/logger virtual/mailx virtual/perl-Storable dev-lang/perl:=
 SLOT=0
 SRC_URI=https://www.cipherdyne.org/psad/download/psad-2.4.6.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f2da7abf2961c1386400ec09f3c4ac0f
+_md5_=bce7cf36fe7c590aad3078f0501e84dc
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 4752fb830377..af3dad7020d5 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r2 b/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r2
index 8b7c56fbd0ab..ed9f8f247dd8 100644
--- a/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r2
+++ b/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r2
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/atk-1.0 >=media-libs/freetype-2.0 >=x11-libs/pango-1.0 dev-lib
 DESCRIPTION=GTK frontend to proftpd
 EAPI=7
 HOMEPAGE=https://mange.dynalias.org/linux/gproftpd
-KEYWORDS=~amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/atk-1.0 >=media-libs/freetype-2.0 >=x11-libs/pango-1.0 dev-libs/glib:2 virtual/libiconv x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://mange.dynup.net/linux/gproftpd/gproftpd-8.3.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3f0d237e63723925a35899eec8833a06
+_md5_=b4050fa8bd3f9d4889975ebff3e66b8a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 38cab28d0a44..c925446786e7 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/kadu-4.3-r2 b/metadata/md5-cache/net-im/kadu-4.3-r2
deleted file mode 100644
index 01b02d4de2d8..000000000000
--- a/metadata/md5-cache/net-im/kadu-4.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/libarchive-2.6[lzma] >=dev-libs/injeqt-1.1.0 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.12.2[threads] ) mpd? ( media-libs/libmpdclient ) otr? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/libotr-4.1.0 ) spell? ( app-text/enchant:0 ) xmpp? ( net-dns/libidn:* >=net-libs/qxmpp-0.9.3-r1 sys-libs/zlib ) dev-qt/linguist-tools:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client
-EAPI=6
-HOMEPAGE=http://www.kadu.net
-IUSE=+gadu mpd otr sdk speech spell xmpp test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-arch/libarchive-2.6[lzma] >=dev-libs/injeqt-1.1.0 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.12.2[threads] ) mpd? ( media-libs/libmpdclient ) otr? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/libotr-4.1.0 ) spell? ( app-text/enchant:0 ) xmpp? ( net-dns/libidn:* >=net-libs/qxmpp-0.9.3-r1 sys-libs/zlib ) speech? ( app-accessibility/powiedz )
-REQUIRED_USE=|| ( gadu xmpp )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.kadu.im/stable/kadu-4.3.tar.bz2
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9888ce6b234461f734d187f06b3259f9
diff --git a/metadata/md5-cache/net-im/zoom-5.4.54779.1115-r2 b/metadata/md5-cache/net-im/zoom-5.4.54779.1115-r3
similarity index 90%
rename from metadata/md5-cache/net-im/zoom-5.4.54779.1115-r2
rename to metadata/md5-cache/net-im/zoom-5.4.54779.1115-r3
index 04411f580521..840f0c5e9945 100644
--- a/metadata/md5-cache/net-im/zoom-5.4.54779.1115-r2
+++ b/metadata/md5-cache/net-im/zoom-5.4.54779.1115-r3
@@ -10,5 +10,5 @@ RDEPEND=!games-engines/zoom dev-libs/glib:2 dev-libs/quazip media-libs/fontconfi
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://zoom.us/client/5.4.54779.1115/zoom_x86_64.tar.xz -> zoom-5.4.54779.1115_x86_64.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2df9333b47a37d7efb9f1b579a8bdc6f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9b34af09ca02b0928f6d2ee02c55c903
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 16261fa89963..f02a8278a405 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/emech-3.0.99_p3 b/metadata/md5-cache/net-irc/emech-3.0.99_p3
index f96dcb008707..21c4ce8870e2 100644
--- a/metadata/md5-cache/net-irc/emech-3.0.99_p3
+++ b/metadata/md5-cache/net-irc/emech-3.0.99_p3
@@ -3,9 +3,9 @@ DESCRIPTION=UNIX compatible IRC bot programmed in the C language
 EAPI=6
 HOMEPAGE=http://www.energymech.net/
 IUSE=debug session tcl
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.energymech.net/files/emech-3.0.99p3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=73f3ff8ad3f0b7ba92f847c066ec1618
+_md5_=8d1d90c5192d81fee9b9f0757a4a2c17
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 618702d8c19e..27e72e84588b 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/cppzmq-4.6.0 b/metadata/md5-cache/net-libs/cppzmq-4.6.0
index d7155ad262a1..6ca296e89746 100644
--- a/metadata/md5-cache/net-libs/cppzmq-4.6.0
+++ b/metadata/md5-cache/net-libs/cppzmq-4.6.0
@@ -5,11 +5,11 @@ DESCRIPTION=High-level CPP Binding for ZeroMQ
 EAPI=7
 HOMEPAGE=https://github.com/zeromq/cppzmq
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 x86 ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=>=net-libs/zeromq-4.3.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/cppzmq/archive/v4.6.0.tar.gz -> cppzmq-4.6.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0903e4df25e8ca0cdc4dfddcba6961a
+_md5_=f77429fc5c80cab86c844b8ded72eb15
diff --git a/metadata/md5-cache/net-libs/libnids-1.24-r7 b/metadata/md5-cache/net-libs/libnids-1.24-r7
index a935647228ba..0c8d32cd37b3 100644
--- a/metadata/md5-cache/net-libs/libnids-1.24-r7
+++ b/metadata/md5-cache/net-libs/libnids-1.24-r7
@@ -5,10 +5,10 @@ DESCRIPTION=an implementation of an E-component of Network Intrusion Detection S
 EAPI=7
 HOMEPAGE=http://libnids.sourceforge.net/
 IUSE=+glib +libnet static-libs
-KEYWORDS=~amd64 ~ppc x86
+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	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4928761aa8529fb48d71eca96eeebaa4
+_md5_=4390d62a9430554144f410eebc452d04
diff --git a/metadata/md5-cache/net-libs/libpcapnav-0.8-r1 b/metadata/md5-cache/net-libs/libpcapnav-0.8-r1
index ec7076f1548a..9c6af3fff271 100644
--- a/metadata/md5-cache/net-libs/libpcapnav-0.8-r1
+++ b/metadata/md5-cache/net-libs/libpcapnav-0.8-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Libpcap wrapper library to navigate to arbitrary packets in a tcpdum
 EAPI=7
 HOMEPAGE=http://netdude.sourceforge.net/
 IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm ~sparc x86
+KEYWORDS=amd64 ~arm ~sparc x86
 LICENSE=BSD
 RDEPEND=net-libs/libpcap
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/netdude/libpcapnav-0.8.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=197c60f11601f5d4ecd3e0c4307543fd
+_md5_=ffce9f55c6cdfc3391f07ff3d2010522
diff --git a/metadata/md5-cache/net-libs/libsmi-0.5.0-r1 b/metadata/md5-cache/net-libs/libsmi-0.5.0-r1
index 483b858b6ead..b9b2d43f69b2 100644
--- a/metadata/md5-cache/net-libs/libsmi-0.5.0-r1
+++ b/metadata/md5-cache/net-libs/libsmi-0.5.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=A Library to Access SMI MIB Information
 EAPI=7
 HOMEPAGE=https://www.ibr.cs.tu-bs.de/projects/libsmi/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.ibr.cs.tu-bs.de/projects/libsmi/download/libsmi-0.5.0.tar.gz
-_md5_=a738e7c3783003408840eb1606f6ace8
+_md5_=353a667dd5845300dfd1f9ab5afdf39e
diff --git a/metadata/md5-cache/net-libs/libwebsockets-4.1.4 b/metadata/md5-cache/net-libs/libwebsockets-4.1.4
index fb34fff69c0c..67e026de7cb1 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-4.1.4
+++ b/metadata/md5-cache/net-libs/libwebsockets-4.1.4
@@ -5,11 +5,11 @@ DESCRIPTION=A flexible pure-C library for implementing network protocols
 EAPI=7
 HOMEPAGE=https://libwebsockets.org/
 IUSE=access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 +lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5 sqlite3 ssl static-libs threads zip
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=MIT
 RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) http-proxy? ( net-libs/libhubbub ) libev? ( dev-libs/libev ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) sqlite3? ( dev-db/sqlite:= ) ssl? ( !libressl? ( !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( >net-libs/mbedtls-2.0.0 ) ) )
 REQUIRED_USE=access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) smtp? ( libuv ) socks5? ( client http-proxy ) ssl? ( ?? ( libressl mbedtls ) ) mbedtls? ( ssl ) ?? ( libev libevent )
 SLOT=0/17
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.1.4.tar.gz -> libwebsockets-4.1.4.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=efd5b72d4b59b5c59bd5d5c3fd09f5ad
+_md5_=c1a3cf92a04eae15a472a576bf4ec5d3
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.42.0 b/metadata/md5-cache/net-libs/nghttp2-1.42.0
index 0bfb0e53616d..38b3dc6110c0 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.42.0
+++ b/metadata/md5-cache/net-libs/nghttp2-1.42.0
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc libressl 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 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=cxx? ( !libressl? ( >=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(-)?] ) libressl? ( dev-libs/libressl:=[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? ( !libressl? ( >=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(-)?] ) libressl? ( dev-libs/libressl:=[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.42.0/nghttp2-1.42.0.tar.xz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=858210f22055da88c98f46c3e604d3f2
+_md5_=e0b32b09ccd18bf32e8d96d1779d925a
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 2ed9ad39b789..a43ab38203eb 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/fdm-2.0 b/metadata/md5-cache/net-mail/fdm-2.0
index fc5753346cfa..aa1fb55368b5 100644
--- a/metadata/md5-cache/net-mail/fdm-2.0
+++ b/metadata/md5-cache/net-mail/fdm-2.0
@@ -4,10 +4,10 @@ DESCRIPTION=fetch, filter and deliver mail
 EAPI=7
 HOMEPAGE=https://github.com/nicm/fdm
 IUSE=examples libressl pcre
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/tdb pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=https://github.com/nicm/fdm/releases/download/2.0/fdm-2.0.tar.gz
 _eclasses_=user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=e6a8ca617e652e881929aa903c66114d
+_md5_=f41d5a2eb0d4f94b0c645b7c75a4f123
diff --git a/metadata/md5-cache/net-mail/swaks-20130209.0-r1 b/metadata/md5-cache/net-mail/swaks-20130209.0-r1
deleted file mode 100644
index bb51840c6979..000000000000
--- a/metadata/md5-cache/net-mail/swaks-20130209.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/perl-5.8.8
-DESCRIPTION=Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH
-EAPI=5
-HOMEPAGE=http://www.jetmore.org/john/code/swaks
-IUSE=ssl
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.8 >=dev-perl/Net-DNS-0.65 ssl? ( >=dev-perl/Net-SSLeay-1.35 ) >=virtual/perl-MIME-Base64-3.07 >=virtual/perl-Digest-MD5-2.39 >=virtual/perl-Time-HiRes-1.97 >=virtual/perl-Time-Local-1.19 >=dev-perl/Authen-NTLM-1.02 >=dev-perl/Authen-DigestMD5-0.04 virtual/perl-Digest-SHA
-SLOT=0
-SRC_URI=http://www.jetmore.org/john/code/swaks/swaks-20130209.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb9f5b1390bb661e9dc3a156d8ae63b1
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 50281c6678f1..ba0e1db82850 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/dhcpcd-9.3.2 b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
similarity index 91%
rename from metadata/md5-cache/net-misc/dhcpcd-9.3.2
rename to metadata/md5-cache/net-misc/dhcpcd-9.3.4
index b9bb68b752b1..e138d9d204bc 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-9.3.2
+++ b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev ) privsep? ( acct-group/dhcpcd acct-user/dhcpcd )
 SLOT=0
-SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-9.3.2.tar.xz
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-9.3.4.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f76ed5269e2547dbe1454cc7ef7a1f8
diff --git a/metadata/md5-cache/net-misc/ipcalc-0.42_p2 b/metadata/md5-cache/net-misc/ipcalc-0.42_p2
index d076b2887fb8..83b9c5e8aa49 100644
--- a/metadata/md5-cache/net-misc/ipcalc-0.42_p2
+++ b/metadata/md5-cache/net-misc/ipcalc-0.42_p2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=IP Calculator prints broadcast/network/etc for an IP address and netmask
 EAPI=7
 HOMEPAGE=http://jodies.de/ipcalc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.6.0
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ipcalc/ipcalc_0.42.orig.tar.gz mirror://debian/pool/main/i/ipcalc/ipcalc_0.42-2.debian.tar.xz
-_md5_=5a4ea13739d85e436d05ce15d8463dfb
+_md5_=6bc844bd4c8dff27b5d314a7c58e6160
diff --git a/metadata/md5-cache/net-misc/ipmiview-2.17.0.200505 b/metadata/md5-cache/net-misc/ipmiview-2.18.0.201007
similarity index 92%
rename from metadata/md5-cache/net-misc/ipmiview-2.17.0.200505
rename to metadata/md5-cache/net-misc/ipmiview-2.18.0.201007
index 46a186e52641..aecb234329d9 100644
--- a/metadata/md5-cache/net-misc/ipmiview-2.17.0.200505
+++ b/metadata/md5-cache/net-misc/ipmiview-2.18.0.201007
@@ -10,6 +10,6 @@ LICENSE=supermicro
 RDEPEND=net-misc/stunnel sys-libs/ncurses-compat:5 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz
+SRC_URI=https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_2.18.0_build.201007_bundleJRE_Linux_x64.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=fd7c0db70cd3f1fabb62d1ca61fa27a0
diff --git a/metadata/md5-cache/net-misc/keychain-2.8.5 b/metadata/md5-cache/net-misc/keychain-2.8.5
index 01034ee37dbf..a3681fa0b544 100644
--- a/metadata/md5-cache/net-misc/keychain-2.8.5
+++ b/metadata/md5-cache/net-misc/keychain-2.8.5
@@ -3,8 +3,8 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 EAPI=6
 HOMEPAGE=https://www.funtoo.org/Keychain
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/funtoo/keychain/archive/2.8.5.tar.gz -> keychain-2.8.5.tar.gz
-_md5_=0162c32e6d93d8408f314e3c658de842
+_md5_=9c08696209405c251fa9ade9085fb03d
diff --git a/metadata/md5-cache/net-misc/libteam-1.31 b/metadata/md5-cache/net-misc/libteam-1.31
index 61fe8e50235b..90ddab182add 100644
--- a/metadata/md5-cache/net-misc/libteam-1.31
+++ b/metadata/md5-cache/net-misc/libteam-1.31
@@ -5,10 +5,10 @@ DESCRIPTION=Library and tools set for controlling team network device
 EAPI=7
 HOMEPAGE=http://libteam.org
 IUSE=dbus debug examples static-libs +syslog zmq kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 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	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ba7c7669cf9dd97e62e396b31edc8602
+_md5_=7aa96cdf1a40571ff59d1f7c1d8fe75a
diff --git a/metadata/md5-cache/net-misc/minidlna-1.3.0 b/metadata/md5-cache/net-misc/minidlna-1.3.0
index c05a705fdfbb..34b1d2a2ba08 100644
--- a/metadata/md5-cache/net-misc/minidlna-1.3.0
+++ b/metadata/md5-cache/net-misc/minidlna-1.3.0
@@ -5,10 +5,10 @@ DESCRIPTION=DLNA/UPnP-AV compliant media server
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/minidlna/
 IUSE=elibc_musl netgear readynas zeroconf
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/minidlna acct-user/minidlna dev-db/sqlite:3 media-libs/flac:= media-libs/libexif:= media-libs/libid3tag:= media-libs/libogg:= media-libs/libvorbis:= media-video/ffmpeg:0= virtual/jpeg:0= elibc_musl? ( sys-libs/queue-standalone ) zeroconf? ( net-dns/avahi:= ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/minidlna/minidlna/1.3.0/minidlna-1.3.0.tar.gz https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c93053300053dc7f143f72bbb0939517
+_md5_=4cbb58770e05476e90cdbadcb2d1d2cd
diff --git a/metadata/md5-cache/net-misc/netifrc-0.7.1-r1 b/metadata/md5-cache/net-misc/netifrc-0.7.1-r1
index 7c7207d9ab75..27c5e93c328c 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.7.1-r1
+++ b/metadata/md5-cache/net-misc/netifrc-0.7.1-r1
@@ -4,10 +4,10 @@ DEPEND=!<sys-fs/udev-172
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-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=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/netifrc.git/snapshot/netifrc-0.7.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=147a08cc0f20f56a7dbe5992508b920a
+_md5_=5841a95f99640c76000e77d8c120757a
diff --git a/metadata/md5-cache/net-misc/ofono-1.31 b/metadata/md5-cache/net-misc/ofono-1.31
index a49a925a2b4f..3433800e8b8f 100644
--- a/metadata/md5-cache/net-misc/ofono-1.31
+++ b/metadata/md5-cache/net-misc/ofono-1.31
@@ -5,11 +5,11 @@ DESCRIPTION=Open Source mobile telephony (GSM/UMTS) daemon
 EAPI=7
 HOMEPAGE=https://01.org/ofono
 IUSE=+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/dbus-1.4 >=dev-libs/glib-2.32 net-misc/mobile-broadband-provider-info bluetooth? ( >=net-wireless/bluez-4.99 ) udev? ( virtual/udev ) examples? ( dev-python/dbus-python ) tools? ( virtual/libusb:1 )
 REQUIRED_USE=dundee? ( bluetooth )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/ofono/ofono-1.31.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ca01caa8130511b184d3f8da5d09f9e4
+_md5_=645e33d65de42d6e1c652fafd441bab4
diff --git a/metadata/md5-cache/net-misc/packETH-2.1 b/metadata/md5-cache/net-misc/packETH-2.1
index f3e82a1153e2..2f4d93fe03b4 100644
--- a/metadata/md5-cache/net-misc/packETH-2.1
+++ b/metadata/md5-cache/net-misc/packETH-2.1
@@ -5,11 +5,11 @@ DESCRIPTION=Packet generator tool for ethernet
 EAPI=7
 HOMEPAGE=http://packeth.sourceforge.net/
 IUSE=cli +gtk
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 REQUIRED_USE=|| ( cli gtk )
 SLOT=0
 SRC_URI=https://github.com/jemcek/packETH/archive/2.1.tar.gz -> packETH-2.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7ca7dd196d5223fa197395efb250d61c
+_md5_=c015bfb96e34cd104032202038c7ba7a
diff --git a/metadata/md5-cache/net-misc/pipes-1.16.1-r1 b/metadata/md5-cache/net-misc/pipes-1.16.1-r1
index 006d132dbfa2..1f11c00f3fa4 100644
--- a/metadata/md5-cache/net-misc/pipes-1.16.1-r1
+++ b/metadata/md5-cache/net-misc/pipes-1.16.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Very versatile TCP pipes
 EAPI=6
 HOMEPAGE=https://bisqwit.iki.fi/source/pipes.html
-KEYWORDS=~amd64 ~ppc ~s390 x86
+KEYWORDS=amd64 ppc s390 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://bisqwit.iki.fi/src/arch/pipes-1.16.1.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ea05a401d41fe7d4cc21e890e016f8cd
+_md5_=66a40a2a8e95d96ae28a204426224818
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.0.8397 b/metadata/md5-cache/net-misc/teamviewer-15.0.8397
deleted file mode 100644
index 66fcdb34b9fe..000000000000
--- a/metadata/md5-cache/net-misc/teamviewer-15.0.8397
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=sys-apps/sed virtual/pkgconfig
-DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
-EAPI=6
-HOMEPAGE=https://www.teamviewer.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=TeamViewer MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/dbus !sys-auth/consolekit
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.0.8397_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.0.8397_i386.tar.xz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0d557508d886821a0d2371f25c5dba0
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.1.3937 b/metadata/md5-cache/net-misc/teamviewer-15.1.3937
deleted file mode 100644
index b37cf2f80aa2..000000000000
--- a/metadata/md5-cache/net-misc/teamviewer-15.1.3937
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=sys-apps/sed virtual/pkgconfig
-DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
-EAPI=6
-HOMEPAGE=https://www.teamviewer.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=TeamViewer MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/dbus !sys-auth/consolekit
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.1.3937_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.1.3937_i386.tar.xz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0d557508d886821a0d2371f25c5dba0
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.2.2756 b/metadata/md5-cache/net-misc/teamviewer-15.2.2756
deleted file mode 100644
index 030916ea1f5e..000000000000
--- a/metadata/md5-cache/net-misc/teamviewer-15.2.2756
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=sys-apps/sed virtual/pkgconfig
-DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
-EAPI=6
-HOMEPAGE=https://www.teamviewer.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=TeamViewer MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/dbus !sys-auth/consolekit
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.2.2756_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.2.2756_i386.tar.xz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b417efcb1dbe72bb87b6a9604804308d
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.3.2682 b/metadata/md5-cache/net-misc/teamviewer-15.3.2682
deleted file mode 100644
index 6f7314f17c0e..000000000000
--- a/metadata/md5-cache/net-misc/teamviewer-15.3.2682
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=sys-apps/sed
-DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
-EAPI=7
-HOMEPAGE=https://www.teamviewer.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=TeamViewer MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/dbus !sys-auth/consolekit
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.3.2682_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.3.2682_i386.tar.xz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66610dc736083c2ffd08da21d0a86cf
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.4.4445 b/metadata/md5-cache/net-misc/teamviewer-15.4.4445
deleted file mode 100644
index 746c1695fcc0..000000000000
--- a/metadata/md5-cache/net-misc/teamviewer-15.4.4445
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=sys-apps/sed
-DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
-EAPI=7
-HOMEPAGE=https://www.teamviewer.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=TeamViewer MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/dbus !sys-auth/consolekit
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.4.4445_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.4.4445_i386.tar.xz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66610dc736083c2ffd08da21d0a86cf
diff --git a/metadata/md5-cache/net-misc/udpcast-20200328 b/metadata/md5-cache/net-misc/udpcast-20200328
index 4204e56ce53a..30dca90ce9c9 100644
--- a/metadata/md5-cache/net-misc/udpcast-20200328
+++ b/metadata/md5-cache/net-misc/udpcast-20200328
@@ -4,9 +4,9 @@ DESCRIPTION=Multicast file transfer tool
 EAPI=7
 HOMEPAGE=https://www.udpcast.linux.lu/
 IUSE=hardened
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 BSD
 SLOT=0
 SRC_URI=https://www.udpcast.linux.lu/download/udpcast-20200328.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee497c11a392897b69eb25eca6b203ee
+_md5_=1fd8f34430c65d9c075e3bea72640e43
diff --git a/metadata/md5-cache/net-misc/usbip-3.19 b/metadata/md5-cache/net-misc/usbip-3.19
deleted file mode 100644
index 67da79ab42e3..000000000000
--- a/metadata/md5-cache/net-misc/usbip-3.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Userspace utilities for a general USB device sharing system over IP networks
-EAPI=5
-HOMEPAGE=https://www.kernel.org/
-IUSE=static-libs tcpd symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.19.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ef6475c3ed503ae0a53603cce65532c5
diff --git a/metadata/md5-cache/net-misc/usbip-4.13 b/metadata/md5-cache/net-misc/usbip-4.13-r1
similarity index 55%
rename from metadata/md5-cache/net-misc/usbip-4.13
rename to metadata/md5-cache/net-misc/usbip-4.13-r1
index ab4f8d712d88..1ec4fdfd071e 100644
--- a/metadata/md5-cache/net-misc/usbip-4.13
+++ b/metadata/md5-cache/net-misc/usbip-4.13-r1
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtua
 DESCRIPTION=Userspace utilities for a general USB device sharing system over IP networks
 EAPI=6
 HOMEPAGE=https://www.kernel.org/
-IUSE=static-libs tcpd symlink build
+IUSE=tcpd symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( 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=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=37ba62a20e3cdefca00a73f5f7ff4c0f
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7d8cd139f4cd66e96ed87d0eb695bde3
diff --git a/metadata/md5-cache/net-misc/wakeonlan-0.41-r3 b/metadata/md5-cache/net-misc/wakeonlan-0.41-r3
index a44c34426bf5..f8d4c260ceb0 100644
--- a/metadata/md5-cache/net-misc/wakeonlan-0.41-r3
+++ b/metadata/md5-cache/net-misc/wakeonlan-0.41-r3
@@ -4,10 +4,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=Client for Wake-On-LAN
 EAPI=7
 HOMEPAGE=https://github.com/jpoliv/wakeonlan/
-KEYWORDS=~amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Artistic GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=https://github.com/jpoliv/wakeonlan/archive/wakeonlan-0.41.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2b25e20f83accbe9e208357258491202
+_md5_=48a459288b544c35864eaa18fcd312b3
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.11.26 b/metadata/md5-cache/net-misc/youtube-dl-2020.11.26
index fd7ae0309bb4..db3b795788fc 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.11.26
+++ b/metadata/md5-cache/net-misc/youtube-dl-2020.11.26
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2020.11.26/youtube-dl-2020.11.26.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3a0aa2499aa88ddd233026cea1daf26a
+_md5_=a733008947a32c28c88213c8b2479606
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.11.29 b/metadata/md5-cache/net-misc/youtube-dl-2020.11.29
new file mode 100644
index 000000000000..7b1f01221e75
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2020.11.29
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=7
+HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2020.11.29/youtube-dl-2020.11.29.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3a0aa2499aa88ddd233026cea1daf26a
diff --git a/metadata/md5-cache/net-misc/youtube-dl-99999999 b/metadata/md5-cache/net-misc/youtube-dl-9999
similarity index 100%
rename from metadata/md5-cache/net-misc/youtube-dl-99999999
rename to metadata/md5-cache/net-misc/youtube-dl-9999
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 9fcc9ec574e4..7084007e6de7 100644
Binary files a/metadata/md5-cache/net-news/Manifest.gz and b/metadata/md5-cache/net-news/Manifest.gz differ
diff --git a/metadata/md5-cache/net-news/snownews-1.5.12-r1 b/metadata/md5-cache/net-news/snownews-1.5.12-r1
deleted file mode 100644
index 2d4f9337933f..000000000000
--- a/metadata/md5-cache/net-news/snownews-1.5.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/libxml2-2.5.6 >=sys-libs/ncurses-5.3[unicode?] dev-libs/openssl virtual/pkgconfig
-DESCRIPTION=Snownews, a text-mode RSS/RDF newsreader
-EAPI=5
-HOMEPAGE=https://kiza.eu/software/snownews/
-IUSE=unicode
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.5.6 >=sys-libs/ncurses-5.3[unicode?] dev-libs/openssl dev-perl/XML-LibXML dev-perl/libwww-perl
-SLOT=0
-SRC_URI=https://kiza.eu/media/software/snownews/snownews-1.5.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4c6c8cdc4f3311b0e1af2332aa9d61b0
diff --git a/metadata/md5-cache/net-news/snownews-1.5.13 b/metadata/md5-cache/net-news/snownews-1.5.13
deleted file mode 100644
index ae3af3e4bb2e..000000000000
--- a/metadata/md5-cache/net-news/snownews-1.5.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=>=dev-libs/libxml2-2.5.6 >=sys-libs/ncurses-5.3:0=[unicode?] dev-libs/openssl:0= virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Command-line RSS feed reader
-EAPI=6
-HOMEPAGE=https://github.com/kouya/snownews
-IUSE=unicode
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/libxml2-2.5.6 >=sys-libs/ncurses-5.3:0=[unicode?] dev-libs/openssl:0= dev-perl/XML-LibXML dev-perl/libwww-perl
-SLOT=0
-SRC_URI=https://github.com/kouya/snownews/archive/v1.5.13.tar.gz -> snownews-1.5.13.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6d461bff1b5a524d0a0ef85b7bb4eb19
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 0c5bd63f0d71..89d9fbdb6f8a 100644
Binary files a/metadata/md5-cache/net-nntp/Manifest.gz and b/metadata/md5-cache/net-nntp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nntp/slrn-1.0.2 b/metadata/md5-cache/net-nntp/slrn-1.0.2
deleted file mode 100644
index 76dab629ad41..000000000000
--- a/metadata/md5-cache/net-nntp/slrn-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/mta app-arch/sharutils >=sys-libs/slang-2.1.3 canlock? ( net-libs/canlock ) ssl? ( dev-libs/openssl ) uudeview? ( dev-libs/uulib ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A s-lang based newsreader
-EAPI=5
-HOMEPAGE=http://slrn.sourceforge.net/
-IUSE=canlock nls ssl uudeview
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/mta app-arch/sharutils >=sys-libs/slang-2.1.3 canlock? ( net-libs/canlock ) ssl? ( dev-libs/openssl ) uudeview? ( dev-libs/uulib )
-SLOT=0
-SRC_URI=https://jedsoft.org/releases/slrn/slrn-1.0.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f2a1a2675f6b72db4b88e6c657efaed4
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 1783024860a7..d4b570b79ccc 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912 b/metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912
index 5bbcb9b6960b..4046dfd14822 100644
--- a/metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912
+++ b/metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912
@@ -4,10 +4,10 @@ DESCRIPTION=Simple command line utility to create BitTorrent metainfo files
 EAPI=7
 HOMEPAGE=https://github.com/Rudde/mktorrent
 IUSE=threads +ssl libressl debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/Rudde/mktorrent/archive/4c221a05d949a3767a2671de139c6014909daf6b.tar.gz -> mktorrent-4c221a05d949a3767a2671de139c6014909daf6b.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b625efd5e9242f48516d30b20190b57a
+_md5_=a6ed7d2dd54d6818be8f3c068c5e128d
diff --git a/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1 b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
index 91b000686597..13641bd6d37f 100644
--- a/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
+++ b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ client for management of the Transmission BitTorrent client, ov
 EAPI=6
 HOMEPAGE=https://github.com/transmission-remote-gtk/transmission-remote-gtk
 IUSE=ayatana debug geoip libnotify libproxy rss
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.12.6 net-misc/curl >=x11-libs/gtk+-3.16:3 ayatana? ( dev-libs/libappindicator:3 ) geoip? ( dev-libs/geoip ) libnotify? ( >=x11-libs/libnotify-0.7 ) libproxy? ( net-libs/libproxy ) rss? ( >=net-libs/libmrss-0.18 )
 SLOT=0
 SRC_URI=https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.4.1/transmission-remote-gtk-1.4.1.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1cc63b373fcf03970c4e0c5a6533b08d
+_md5_=30ae30630479ccb4d254b9c038896f77
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 393739b6ba70..29cad886b62d 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/c2esp-26 b/metadata/md5-cache/net-print/c2esp-26
deleted file mode 100644
index f07b8aba227f..000000000000
--- a/metadata/md5-cache/net-print/c2esp-26
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=media-libs/jbigkit-2.0-r1 >=net-print/cups-1.4
-DESCRIPTION=A cups filter for Kodak ESP printers
-EAPI=5
-HOMEPAGE=http://cupsdriverkodak.sf.net/
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/jbigkit-2.0-r1 >=net-print/cups-1.4
-SLOT=0
-SRC_URI=mirror://sourceforge/cupsdriverkodak/files/c2esp26.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=83524b351aa45082c234bcc141dcb182
diff --git a/metadata/md5-cache/net-print/c2esp-27 b/metadata/md5-cache/net-print/c2esp-27
index d19cc505ca55..538385722ae9 100644
--- a/metadata/md5-cache/net-print/c2esp-27
+++ b/metadata/md5-cache/net-print/c2esp-27
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/jbigkit-2.0-r1:= >=net-print/cups-1.6 sys-libs/zlib:=
 SLOT=0
 SRC_URI=mirror://sourceforge/cupsdriverkodak/files/c2esp-27.tar.gz
-_md5_=539037b3c07557d7cfbdd2999b2ebe04
+_md5_=8145e23d378cd3f56c84babf2ca38c95
diff --git a/metadata/md5-cache/net-print/libgnomecups-0.2.3-r3 b/metadata/md5-cache/net-print/libgnomecups-0.2.3-r3
deleted file mode 100644
index d9cafd9b5bf5..000000000000
--- a/metadata/md5-cache/net-print/libgnomecups-0.2.3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2:2 >=net-print/cups-1.3.8 >=dev-util/intltool-0.28 gnome-base/gnome-common virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME cups library
-EAPI=5
-HOMEPAGE=https://www.gnome.org/
-IUSE=debug
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-libs/glib-2:2 >=net-print/cups-1.3.8
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a227d34d7abb64078d19b15049823eba
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 87c93cce14f9..f9b80c03f517 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.5 b/metadata/md5-cache/net-proxy/haproxy-2.2.5
index eadbaf671bd4..6f6b4de2614a 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.5
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.5
@@ -5,11 +5,11 @@ DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
 IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( 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 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b9cf202f676a730d9f0f79b4b5e590ac
+_md5_=0437f75a41c747114df19a9f87589d38
diff --git a/metadata/md5-cache/net-proxy/nutcracker-0.2.4 b/metadata/md5-cache/net-proxy/nutcracker-0.2.4
deleted file mode 100644
index 1585996d84df..000000000000
--- a/metadata/md5-cache/net-proxy/nutcracker-0.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libyaml-0.1.4 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A fast, light-weight proxy for Memcached and Redis. (Twitter's Twemproxy)
-EAPI=5
-HOMEPAGE=https://github.com/twitter/twemproxy
-IUSE=debug doc
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/libyaml-0.1.4
-SLOT=0
-SRC_URI=https://twemproxy.googlecode.com/files/nutcracker-0.2.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c55a90fccbf82c55e7c9647f57bc1861
diff --git a/metadata/md5-cache/net-proxy/nutcracker-0.3.0 b/metadata/md5-cache/net-proxy/nutcracker-0.3.0
deleted file mode 100644
index 58402fde6b53..000000000000
--- a/metadata/md5-cache/net-proxy/nutcracker-0.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libyaml-0.1.4 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A fast, light-weight proxy for Memcached and Redis. (Twitter's Twemproxy)
-EAPI=5
-HOMEPAGE=https://github.com/twitter/twemproxy
-IUSE=debug doc
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/libyaml-0.1.4
-SLOT=0
-SRC_URI=https://twemproxy.googlecode.com/files/nutcracker-0.3.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4ecf7070b5555ff59bbe195c07759e5
diff --git a/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1 b/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
deleted file mode 100644
index d2b14b2f1079..000000000000
--- a/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=media-libs/giflib:0= media-libs/libpng:0= virtual/jpeg:0 sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd )
-DESCRIPTION=A forwarding, non-caching, compressing web proxy server
-EAPI=6
-HOMEPAGE=http://ziproxy.sourceforge.net/
-IUSE=sasl xinetd
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/giflib:0= media-libs/libpng:0= virtual/jpeg:0 sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd )
-SLOT=0
-SRC_URI=mirror://sourceforge/ziproxy/ziproxy-3.3.1.tar.xz
-_eclasses_=user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=1d653a2bcaf9519f5e05e933ea77f550
diff --git a/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r2 b/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r2
new file mode 100644
index 000000000000..6440b3b1cb03
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=acct-group/ziproxy acct-user/ziproxy media-libs/giflib:0= media-libs/libpng:0= virtual/jpeg:0 sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd )
+DESCRIPTION=A forwarding, non-caching, compressing web proxy server
+EAPI=7
+HOMEPAGE=http://ziproxy.sourceforge.net/
+IUSE=sasl xinetd
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/ziproxy acct-user/ziproxy media-libs/giflib:0= media-libs/libpng:0= virtual/jpeg:0 sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd )
+SLOT=0
+SRC_URI=mirror://sourceforge/ziproxy/ziproxy-3.3.1.tar.xz
+_md5_=4201d0f13e4fb9a5cee0447078e28611
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 3882cfc5f01c..493356762476 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/vtun-3.0.3 b/metadata/md5-cache/net-vpn/vtun-3.0.3
deleted file mode 100644
index fe0f3e55bee2..000000000000
--- a/metadata/md5-cache/net-vpn/vtun-3.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=ssl? ( dev-libs/openssl:0 ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante ) sys-devel/bison
-DESCRIPTION=Create tunnels over TCP/IP networks with shaping, encryption, and compression
-EAPI=5
-HOMEPAGE=http://vtun.sourceforge.net/
-IUSE=lzo socks5 ssl zlib kernel_linux
-KEYWORDS=~alpha amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0 ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante )
-SLOT=0
-SRC_URI=mirror://sourceforge/vtun/vtun-3.0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7aeb9ef7bfd0eba0532a7b92332ea6ca
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index eec0749f7b3e..7f1e5e7e67a5 100644
Binary files a/metadata/md5-cache/sci-calculators/Manifest.gz and b/metadata/md5-cache/sci-calculators/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1 b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
index bf8331e3c774..8e92da115b63 100644
--- a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
+++ b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
@@ -1,12 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=x11-libs/libX11 x11-libs/libXpm sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=x11-libs/libX11 x11-libs/libXpm
 DESCRIPTION=DJ's Hex Calculator
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/downloads/jlec/hcalc/hcalc-1.2.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f332d127f59747df3edff15e2cbf517
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64b79c7ffaaf855ebf3acad49406dbaf
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index a252c415b587..7fc12af08a3a 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.4.0 b/metadata/md5-cache/sci-chemistry/pymol-2.4.0
index 957e687a7996..d8f58dd04417 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-2.4.0
+++ b/metadata/md5-cache/sci-chemistry/pymol-2.4.0
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/PyQt5[opengl,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pmw[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib
 DESCRIPTION=A Python-extensible molecular graphics system
@@ -13,4 +13,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.4.0.tar.gz -> pymol-2.4.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7f29af7b9309743b19f8cf6a594327e
+_md5_=dfc3fd4ee81b72f28e6e1a3403d71391
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index cb48b3f39c90..25753f9dfbd0 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/xoscope-2.1 b/metadata/md5-cache/sci-electronics/xoscope-2.1
deleted file mode 100644
index a8eb97784c8f..000000000000
--- a/metadata/md5-cache/sci-electronics/xoscope-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=x11-libs/gtkdatabox virtual/man virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Soundcard Oscilloscope for X
-EAPI=5
-HOMEPAGE=http://xoscope.sourceforge.net
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtkdatabox virtual/man
-SLOT=0
-SRC_URI=mirror://sourceforge/project/xoscope/xoscope/2.1/xoscope-2.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b38c3cd82d22a53adb061d70ba604a62
diff --git a/metadata/md5-cache/sci-electronics/xoscope-2.2 b/metadata/md5-cache/sci-electronics/xoscope-2.2
new file mode 100644
index 000000000000..d240e727d41d
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/xoscope-2.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare setup
+DEPEND=sci-libs/fftw:3.0= virtual/man x11-libs/gtkdatabox
+DESCRIPTION=Soundcard Oscilloscope for X
+EAPI=7
+HOMEPAGE=http://xoscope.sourceforge.net
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+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	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b27df7b1ad3372569b02b721fa27d9a2
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index a468fc701ae9..8b35f58fae2c 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-7.37 b/metadata/md5-cache/sci-geosciences/gpxsee-7.37
new file mode 100644
index 000000000000..53e93b61d32d
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-7.37
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
+EAPI=7
+HOMEPAGE=https://www.gpxsee.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=https://github.com/tumic0/GPXSee/archive/7.37.tar.gz -> gpxsee-7.37.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=17bb3b02686526b286a4b47316e857bf
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.15.0 b/metadata/md5-cache/sci-geosciences/qmapshack-1.15.0
deleted file mode 100644
index ab98d49515ad..000000000000
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.15.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtwebengine:5[widgets] dev-qt/qtdeclarative:5[widgets] dev-qt/qtprintsupport:5 dev-qt/qtpositioning:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qthelp:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal >=sci-libs/proj-6.0.0:= sci-libs/alglib dev-qt/linguist-tools:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GPS mapping utility
-EAPI=7
-HOMEPAGE=https://github.com/Maproom/qmapshack/wiki
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtwebengine:5[widgets] dev-qt/qtdeclarative:5[widgets] dev-qt/qtprintsupport:5 dev-qt/qtpositioning:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qthelp:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal >=sci-libs/proj-6.0.0:= sci-libs/alglib
-SLOT=0
-SRC_URI=https://github.com/Maproom/qmapshack/archive/V_1.15.0.tar.gz -> qmapshack-1.15.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86e5c32c3f9e872f13a64105f3d21613
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.15.1 b/metadata/md5-cache/sci-geosciences/qmapshack-1.15.1
new file mode 100644
index 000000000000..326722b1a9ae
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.15.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtwebengine:5[widgets] dev-qt/qtdeclarative:5[widgets] dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qthelp:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal >=sci-libs/proj-6.0.0:= sci-libs/alglib dev-qt/linguist-tools:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GPS mapping utility
+EAPI=7
+HOMEPAGE=https://github.com/Maproom/qmapshack/wiki
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtwebengine:5[widgets] dev-qt/qtdeclarative:5[widgets] dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qthelp:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal >=sci-libs/proj-6.0.0:= sci-libs/alglib
+SLOT=0
+SRC_URI=https://github.com/Maproom/qmapshack/archive/V_1.15.1.tar.gz -> qmapshack-1.15.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c87aa0d50231ae75f19d166fb23c5bed
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index a6061efeaadd..796104001ecf 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc1 b/metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc3
similarity index 98%
rename from metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc1
rename to metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc3
index 017679fa3fe3..61cdb1129830 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc1
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc3
@@ -1,6 +1,6 @@
 BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.8.0 dev-java/java-config =dev-util/bazel-3* 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.28:= net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( || ( ( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* ) ( =dev-util/nvidia-cuda-toolkit-11.0*[profiler] =dev-libs/cudnn-8* ) ( =dev-util/nvidia-cuda-toolkit-10.2*[profiler] >=dev-libs/cudnn-7.6 ) ( =dev-util/nvidia-cuda-toolkit-10.1*[profiler] >=dev-libs/cudnn-7.5 ) ( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* ) ( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* ) ( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* ) ) ) mpi? ( virtual/mpi ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/flatbuffers-1.12.0:= dev-python/absl-py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/astor-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/astunparse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/dill[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flatbuffers[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/gast-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/h5py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/numpy-1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-pasta-0.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/opt-einsum-3.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/termcolor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/typing-extensions[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/grpcio-1.28[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wrapt-1.11.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/keras-preprocessing-1.1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-visualization/tensorboard-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python? ( dev-python/mock dev-python/setuptools )
+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.28:= net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( || ( ( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* ) ( =dev-util/nvidia-cuda-toolkit-11.0*[profiler] =dev-libs/cudnn-8* ) ( =dev-util/nvidia-cuda-toolkit-10.2*[profiler] >=dev-libs/cudnn-7.6 ) ( =dev-util/nvidia-cuda-toolkit-10.1*[profiler] >=dev-libs/cudnn-7.5 ) ( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* ) ( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* ) ( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* ) ) ) mpi? ( virtual/mpi ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/flatbuffers-1.12.0:= dev-python/absl-py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/astor-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/astunparse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/dill[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flatbuffers[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/gast-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/h5py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/numpy-1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-pasta-0.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/opt-einsum-3.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/termcolor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/typing-extensions[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/grpcio-1.28[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wrapt-1.11.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/keras-preprocessing-1.1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-visualization/tensorboard-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) 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/
@@ -8,9 +8,9 @@ IUSE=cuda mpi +python xla cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 PDEPEND=python? ( >=sci-libs/tensorflow-estimator-2.4.0_rc0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-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.28:= net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( || ( ( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* ) ( =dev-util/nvidia-cuda-toolkit-11.0*[profiler] =dev-libs/cudnn-8* ) ( =dev-util/nvidia-cuda-toolkit-10.2*[profiler] >=dev-libs/cudnn-7.6 ) ( =dev-util/nvidia-cuda-toolkit-10.1*[profiler] >=dev-libs/cudnn-7.5 ) ( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* ) ( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* ) ( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* ) ) ) mpi? ( virtual/mpi ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/flatbuffers-1.12.0:= dev-python/absl-py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/astor-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/astunparse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/dill[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flatbuffers[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/gast-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/h5py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/numpy-1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-pasta-0.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/opt-einsum-3.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/termcolor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/typing-extensions[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/grpcio-1.28[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wrapt-1.11.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/keras-preprocessing-1.1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-visualization/tensorboard-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+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.28:= net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( || ( ( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* ) ( =dev-util/nvidia-cuda-toolkit-11.0*[profiler] =dev-libs/cudnn-8* ) ( =dev-util/nvidia-cuda-toolkit-10.2*[profiler] >=dev-libs/cudnn-7.6 ) ( =dev-util/nvidia-cuda-toolkit-10.1*[profiler] >=dev-libs/cudnn-7.5 ) ( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* ) ( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* ) ( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* ) ) ) mpi? ( virtual/mpi ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/flatbuffers-1.12.0:= dev-python/absl-py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/astor-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/astunparse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/dill[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flatbuffers[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/gast-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/h5py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/numpy-1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-pasta-0.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/opt-einsum-3.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/termcolor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/typing-extensions[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/grpcio-1.28[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wrapt-1.11.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/keras-preprocessing-1.1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-visualization/tensorboard-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
-SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.4.0-rc1.tar.gz -> tensorflow-2.4.0_rc1.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.4.0_rc1.tar.bz2 https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://gitlab.com/libeigen/eigen/-/archive/011e0db31d1bed8b7f73662be6d57d9f30fa457a/eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 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/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz -> llvm-f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/google/ruy/archive/5bb02fbf90824c2eb6cd7418f766c593106a332b.zip -> ruy-5bb02fbf90824c2eb6cd7418f766c593106a332b.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip cuda? ( https://github.com/nvidia/nccl/archive/195232556936b39b01cc908296e1650b80d4a3e9.tar.gz -> nvidia-nccl-195232556936b39b01cc908296e1650b80d4a3e9.tar.gz https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip ) 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/tensorflow/tensorflow/archive/v2.4.0-rc3.tar.gz -> tensorflow-2.4.0_rc3.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.4.0_rc3.tar.bz2 https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://gitlab.com/libeigen/eigen/-/archive/011e0db31d1bed8b7f73662be6d57d9f30fa457a/eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 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/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz -> llvm-f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/google/ruy/archive/5bb02fbf90824c2eb6cd7418f766c593106a332b.zip -> ruy-5bb02fbf90824c2eb6cd7418f766c593106a332b.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip cuda? ( https://github.com/nvidia/nccl/archive/195232556936b39b01cc908296e1650b80d4a3e9.tar.gz -> nvidia-nccl-195232556936b39b01cc908296e1650b80d4a3e9.tar.gz https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip ) 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	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8ae4fa282385b2c739097c609bc1755
+_md5_=49c409d6e12869f27a3e7a0637a71965
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index cdd7e97fdea3..6d047ae5a079 100644
Binary files a/metadata/md5-cache/sci-misc/Manifest.gz and b/metadata/md5-cache/sci-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4 b/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4
deleted file mode 100644
index fd12652e5725..000000000000
--- a/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Research management tool for desktop and web
-EAPI=7
-HOMEPAGE=https://www.mendeley.com/
-IUSE=python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Mendeley-terms
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 dev-qt/qtxml:5 sys-libs/zlib virtual/opengl x11-libs/libX11
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
-RESTRICT=bindist fetch
-SLOT=0
-SRC_URI=amd64? ( mendeleydesktop-1.19.4-linux-x86_64.tar.bz2 ) x86? ( mendeleydesktop-1.19.4-linux-i486.tar.bz2 ) amd64-linux? ( mendeleydesktop-1.19.4-linux-x86_64.tar.bz2 ) x86-linux? ( mendeleydesktop-1.19.4-linux-i486.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8db27c167a8c0fbf3ac4b02bf46f9f64
diff --git a/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.5 b/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.5
deleted file mode 100644
index 4494f848d475..000000000000
--- a/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Research management tool for desktop and web
-EAPI=7
-HOMEPAGE=https://www.mendeley.com/
-IUSE=python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Mendeley-terms
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 dev-qt/qtxml:5 sys-libs/zlib virtual/opengl x11-libs/libX11
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
-RESTRICT=bindist fetch
-SLOT=0
-SRC_URI=amd64? ( mendeleydesktop-1.19.5-linux-x86_64.tar.bz2 ) x86? ( mendeleydesktop-1.19.5-linux-i486.tar.bz2 ) amd64-linux? ( mendeleydesktop-1.19.5-linux-x86_64.tar.bz2 ) x86-linux? ( mendeleydesktop-1.19.5-linux-i486.tar.bz2 )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8db27c167a8c0fbf3ac4b02bf46f9f64
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 497f37676a7d..f1ef2d7da827 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/tensorboard-2.4.0 b/metadata/md5-cache/sci-visualization/tensorboard-2.4.0
new file mode 100644
index 000000000000..0060ad61b611
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/tensorboard-2.4.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=install prepare
+DESCRIPTION=TensorFlow's Visualization Toolkit
+EAPI=7
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PDEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bleach[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-1.6.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-oauthlib-0.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/grpcio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-41[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/scipy-1.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/py3/t/tensorboard/tensorboard-2.4.0-py3-none-any.whl -> tensorboard-2.4.0.zip
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=77ddca9113c1d27c01e8ce0dd05b1832
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b0322d2f33b1..6d511674515c 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/moreutils-0.64 b/metadata/md5-cache/sys-apps/moreutils-0.64
index e6922739f075..0c3f68bf5263 100644
--- a/metadata/md5-cache/sys-apps/moreutils-0.64
+++ b/metadata/md5-cache/sys-apps/moreutils-0.64
@@ -4,10 +4,10 @@ DESCRIPTION=a collection of tools that nobody thought to write when Unix was you
 EAPI=7
 HOMEPAGE=https://joeyh.name/code/moreutils/ https://git.joeyh.name/index.cgi/moreutils.git/
 IUSE=+doc +perl
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl dev-perl/IPC-Run dev-perl/Time-Duration dev-perl/TimeDate )
 SLOT=0
 SRC_URI=https://git.joeyh.name/index.cgi/moreutils.git/snapshot/moreutils-0.64.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9c18798e3790b841cb363c0399f9e7d5
+_md5_=82a1c98df5566649fa06672652fddb45
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1 b/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
index f355eefeb6f5..adb95e976fc5 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
@@ -4,7 +4,7 @@ DESCRIPTION=a framework for package management
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcore
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.13.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5bd75cdfafafea4daced8f6ed4491644
+_md5_=a3c0aadab26628f2106d54aa6c9fa83e
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.11 b/metadata/md5-cache/sys-apps/portage-3.0.11
new file mode 100644
index 000000000000..5b7c4b7da91a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-3.0.11
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx dev-python/sphinx-epytext )
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-3.0.11.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.11.tar.bz2
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=721d2ce89272d3732cabe65a5a7e4c89
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-246 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
index d5dda9471452..5f5010a63d8d 100644
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
@@ -5,11 +5,11 @@ DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and dire
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=test
-KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT public-domain
 RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= >=sys-kernel/linux-headers-3.11 sys-libs/libcap:0= !sys-apps/opentmpfiles !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v246.tar.gz -> systemd-246.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-tmpfiles-246-musl.tar.xz )
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=24e8cc30b6c1bd8318e8258061539d2f
+_md5_=1da1f47166337d42d72b9f027e06d30a
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 4990be6d72f0..da59ebd1eb19 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.6 b/metadata/md5-cache/sys-cluster/galera-26.4.6
index 03ef263fa4fd..9580ae309527 100644
--- a/metadata/md5-cache/sys-cluster/galera-26.4.6
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.6
@@ -5,11 +5,11 @@ DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep
 EAPI=7
 HOMEPAGE=https://galeracluster.com
 IUSE=cpu_flags_x86_sse4_2 garbd test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.galeracluster.com/galera-4/source/galera-4-26.4.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=775a5ec65ca0304b86931c5d1932b12e
+_md5_=a291575dfde3a833c0f1a1bd6c965e06
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 9c586fbe47a2..02d2b95c0c81 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.0 b/metadata/md5-cache/sys-devel/clang-10.0.0
deleted file mode 100644
index b3f4c3f0bcb7..000000000000
--- a/metadata/md5-cache/sys-devel/clang-10.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-10.0.0:10=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,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-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !!sys-devel/llvm:0
-DESCRIPTION=C language family frontend for LLVM
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR 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_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-10.0.0 default-compiler-rt? ( =sys-libs/compiler-rt-10.0.0* ) default-libcxx? ( >=sys-libs/libcxx-10.0.0 )
-RDEPEND=~sys-devel/llvm-10.0.0:10=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,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-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR )
-RESTRICT=!test? ( test )
-SLOT=10
-SRC_URI=!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.0-manpages.tar.bz2 ) https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50fbadc43bf3250a64a4be1e3fd4316a
diff --git a/metadata/md5-cache/sys-devel/clang-11.0.0.9999 b/metadata/md5-cache/sys-devel/clang-11.0.0.9999
index 86670f8c246e..2c4c28d6ff11 100644
--- a/metadata/md5-cache/sys-devel/clang-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-11.0.0.9999
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-util/cmake-3.16 doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/cmake-3.16 doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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-python/sphinx dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=~sys-devel/llvm-11.0.0.9999:11=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_VE?,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-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) !!sys-devel/llvm:0
 DESCRIPTION=C language family frontend for LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE 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_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE test doc 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_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-11.0.0.9999 default-compiler-rt? ( =sys-libs/compiler-rt-11.0.0.9999* ) default-libcxx? ( >=sys-libs/libcxx-11.0.0.9999 ) default-lld? ( sys-devel/lld )
 PROPERTIES=live
 RDEPEND=~sys-devel/llvm-11.0.0.9999:11=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_VE?,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-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=11
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38e1792842ad7ceb042e43fc75443e80
+_md5_=c8e6cbb2fadbbd58099b9a7e4dcf4379
diff --git a/metadata/md5-cache/sys-devel/clang-12.0.0.9999 b/metadata/md5-cache/sys-devel/clang-12.0.0.9999
index 9e97e476047f..7190055083a7 100644
--- a/metadata/md5-cache/sys-devel/clang-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-12.0.0.9999
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-util/cmake-3.16 doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/cmake-3.16 doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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-python/sphinx dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=~sys-devel/llvm-12.0.0.9999:12=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_CSKY?,llvm_targets_VE?,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-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) !!sys-devel/llvm:0
 DESCRIPTION=C language family frontend for LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE 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_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE test doc 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_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-12.0.0.9999 default-compiler-rt? ( =sys-libs/compiler-rt-12.0.0.9999* ) default-libcxx? ( >=sys-libs/libcxx-12.0.0.9999 ) default-lld? ( sys-devel/lld )
 PROPERTIES=live
 RDEPEND=~sys-devel/llvm-12.0.0.9999:12=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_CSKY?,llvm_targets_VE?,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-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=12
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d70c07eee59c397cb3365803bc00a3b5
+_md5_=5e92c2b137aade85b670332b0e4af54b
diff --git a/metadata/md5-cache/sys-devel/clang-common-10.0.0 b/metadata/md5-cache/sys-devel/clang-common-10.0.0
deleted file mode 100644
index 5dd8e67c182e..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-10.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=7
-HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:*
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=886b10c625deca52b7b2a114a9484c5f
diff --git a/metadata/md5-cache/sys-devel/clang-common-11.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-11.0.0.9999
index 1f154d2999f2..2a0202bc151b 100644
--- a/metadata/md5-cache/sys-devel/clang-common-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-11.0.0.9999
@@ -8,4 +8,4 @@ PDEPEND=sys-devel/clang:*
 PROPERTIES=live
 SLOT=0
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a6513b1aae1caeb77b1491bb87b5058a
+_md5_=f8569e8a5bf8ff1d82a0eb032fcf9223
diff --git a/metadata/md5-cache/sys-devel/clang-common-12.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-12.0.0.9999
index 1f154d2999f2..2a0202bc151b 100644
--- a/metadata/md5-cache/sys-devel/clang-common-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-12.0.0.9999
@@ -8,4 +8,4 @@ PDEPEND=sys-devel/clang:*
 PROPERTIES=live
 SLOT=0
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a6513b1aae1caeb77b1491bb87b5058a
+_md5_=f8569e8a5bf8ff1d82a0eb032fcf9223
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-10.0.0 b/metadata/md5-cache/sys-devel/clang-runtime-10.0.0
deleted file mode 100644
index 0e6c0204bc59..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-10.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=7
-HOMEPAGE=https://clang.llvm.org/
-IUSE=+compiler-rt libcxx openmp +sanitize 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 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-10.0.0:10.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-10.0.0:10.0.0 ) ) libcxx? ( >=sys-libs/libcxx-10.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(-)?] ) openmp? ( >=sys-libs/libomp-10.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(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=10.0.0
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=076033ecd81d1cd3c0592b82c367bdfd
diff --git a/metadata/md5-cache/sys-devel/crossdev-20201108 b/metadata/md5-cache/sys-devel/crossdev-20201108
deleted file mode 100644
index 5559b49b5a4d..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20201108
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20201108.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20201108.tar.xz
-_md5_=8879ddb044df4971609b216a3a9dd2ad
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.0 b/metadata/md5-cache/sys-devel/lld-10.0.0
deleted file mode 100644
index 40e507581aa9..000000000000
--- a/metadata/md5-cache/sys-devel/lld-10.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( || ( ( dev-lang/python:3.8 ~dev-python/lit-10.0.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 ~dev-python/lit-10.0.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-10.0.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-10.0.0 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=test
-KEYWORDS=amd64 arm arm64 ppc64 x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=~sys-devel/llvm-10.0.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f412aabf3c5a0623700fdb3254bdcbd2
diff --git a/metadata/md5-cache/sys-devel/lld-11.0.0.9999 b/metadata/md5-cache/sys-devel/lld-11.0.0.9999
index 4c3d1771d11d..d64e8b6edc9a 100644
--- a/metadata/md5-cache/sys-devel/lld-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-11.0.0.9999
@@ -4,11 +4,11 @@ DEPEND=~sys-devel/llvm-11.0.0.9999 !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test
+IUSE=test test
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=~sys-devel/llvm-11.0.0.9999
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49eb37578568007784857742d7cfa04c
+_md5_=a0e21661235a318dc67e16d10d16d2d7
diff --git a/metadata/md5-cache/sys-devel/lld-12.0.0.9999 b/metadata/md5-cache/sys-devel/lld-12.0.0.9999
index e156900de98d..e3581b342374 100644
--- a/metadata/md5-cache/sys-devel/lld-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-12.0.0.9999
@@ -4,11 +4,11 @@ DEPEND=~sys-devel/llvm-12.0.0.9999 !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test
+IUSE=test test
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=~sys-devel/llvm-12.0.0.9999
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0542a9b4effbe0c842e495a2e74b9c90
+_md5_=695fbbe6bd3fd803415b72369447d2e9
diff --git a/metadata/md5-cache/sys-devel/llvm-11.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
index 88984dbfcfcc..bc4548d64678 100644
--- a/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
@@ -1,10 +1,10 @@
-BDEPEND=dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-11.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.9 dev-python/recommonmark[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-11.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.9 dev-python/recommonmark[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-python/sphinx dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib: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(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-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(-)?] ) ncurses? ( >=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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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(-)?] ) z3? ( >=sci-mathematics/z3-4.7.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(-)?] ) gold? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE 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=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE doc 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=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-11 )
 PROPERTIES=live
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=11
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=59475d4179d862b6e111144e34b60cba
+_md5_=7c0c1a4c094b073f8c45c39cac287974
diff --git a/metadata/md5-cache/sys-devel/llvm-12.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-12.0.0.9999
index c157e99b4ced..ae5bd9453620 100644
--- a/metadata/md5-cache/sys-devel/llvm-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-12.0.0.9999
@@ -1,10 +1,10 @@
-BDEPEND=dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-12.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.9 dev-python/recommonmark[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-12.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.9 dev-python/recommonmark[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-python/sphinx dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib: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(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-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(-)?] ) ncurses? ( >=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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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(-)?] ) z3? ( >=sci-mathematics/z3-4.7.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(-)?] ) gold? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE 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=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE doc 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=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-12 )
 PROPERTIES=live
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=12
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6bae358df59d7c7bd30296e0f7072c79
+_md5_=e2eeb2c811c2d5822be3bf560eeef3dd
diff --git a/metadata/md5-cache/sys-devel/llvm-common-10.0.0 b/metadata/md5-cache/sys-devel/llvm-common-10.0.0
deleted file mode 100644
index a8121d6cd7b9..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-10.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=7
-HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=llvm.org	f9a86faa44b9076b1603ff7c37564776	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=50c1f0e11c65867fa9ccc23de12003ff
diff --git a/metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999
index 64398c8ab215..f4475db7c664 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=c8c5ff1b18ab0822fe355d25c5b2b6e6
+_md5_=69b5382e6a4c27c13e4114449b987724
diff --git a/metadata/md5-cache/sys-devel/llvm-common-12.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-12.0.0.9999
index 64398c8ab215..f4475db7c664 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-12.0.0.9999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=c8c5ff1b18ab0822fe355d25c5b2b6e6
+_md5_=69b5382e6a4c27c13e4114449b987724
diff --git a/metadata/md5-cache/sys-fabric/Manifest.gz b/metadata/md5-cache/sys-fabric/Manifest.gz
index 3e09cc9681ea..55fd5ed65a74 100644
Binary files a/metadata/md5-cache/sys-fabric/Manifest.gz and b/metadata/md5-cache/sys-fabric/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fabric/infinipath-psm-3.2 b/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
index 8b63655d896a..001d8a26c6d4 100644
--- a/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
+++ b/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
@@ -9,4 +9,4 @@ RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/infinipath-psm:0 !sys-fabric/infi
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9635e09ab70f1fc2148f68c9ff4db65e
+_md5_=7d1f58ee7b0ec97ad3405e430494f398
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 82c6aba6654c..35883ea2a1ab 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/fuse-overlayfs-1.3.0 b/metadata/md5-cache/sys-fs/fuse-overlayfs-1.3.0
new file mode 100644
index 000000000000..39e131fcf8b6
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fuse-overlayfs-1.3.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=>=sys-fs/fuse-3:=
+DESCRIPTION=FUSE implementation for overlayfs
+EAPI=7
+HOMEPAGE=https://github.com/containers/fuse-overlayfs
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-3
+RDEPEND=>=sys-fs/fuse-3:=
+SLOT=0
+SRC_URI=https://github.com/containers/fuse-overlayfs/archive/v1.3.0.tar.gz -> fuse-overlayfs-1.3.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1b7661f1afac90e5f074ad5da192284d
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.26 b/metadata/md5-cache/sys-fs/mtools-4.0.26
new file mode 100644
index 000000000000..1560eee7fcce
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.26
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
+DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
+IUSE=X elibc_glibc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris
+LICENSE=GPL-3
+RDEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
+SLOT=0
+SRC_URI=mirror://gnu/mtools/mtools-4.0.26.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3f0001720afe721b74c7156c8376957a
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4ac3f6ede402..bbd0711c6b6e 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.209 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.209
index e3a836f2ab4a..4ff40a69f1a9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.209
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.209
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-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=!build? ( 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.209
 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-219.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-219.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-219.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-219.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-219.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-219.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-219.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-219.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-219.experimental.tar.xz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=de99a0b4a1faeec60b4bb5a16fb7a435
+_md5_=b0ce96fe8a08edc2af4c65605cb2f39f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.160 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.160
index a7a36d648f69..c1b967b53ea8 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.160
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.160
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-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=!build? ( 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.160
 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-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-159.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-159.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-159.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-159.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-159.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-159.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-159.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-159.experimental.tar.xz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2ddb0b2adc8917700e936fb98f6fe058
+_md5_=bbc18aba0dd2b7b2233a28b6602410f1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.246 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.246
index 48268c0d5ef8..d684bf203901 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.246
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.246
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-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 linux-firmware
 RDEPEND=!build? ( 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.246
 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-248.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-248.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-248.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-248.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-248.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-248.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-248.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-248.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-248.experimental.tar.xz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e19d4d42658c65ca7e7987e5a90c3b8a
+_md5_=7687451800e51f875b90fa06360cfb04
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.246 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.246
index 0c748d03c274..1e5d6968ebb2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.246
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.246
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-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 linux-firmware
 RDEPEND=!build? ( 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.246
 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-250.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-250.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-250.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-250.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-250.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-250.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-250.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-250.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-250.experimental.tar.xz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eb86051fb17c483446bf9d987e08d8f1
+_md5_=b6295aec9d835ed6e6c23afbc9eedbca
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.80-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.80-r1
index 607bffe14efa..094750374155 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.80-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.80-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-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=!build? ( 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.80-r1
 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-82.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-82.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-82.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-82.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-82.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-82.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-82.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-82.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-82.experimental.tar.xz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=473dbdadc1818fad020436dd67ac5c3b
+_md5_=2d084de6f08017d4f79e3968ca7e0b7b
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 1e28195c62dd..540f07d846b1 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
deleted file mode 100644
index 33d4a97f8119..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.8 >=dev-python/lit-9.0.1[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-10.0.0*:10 ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=+clang test
-KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=10.0.0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92578df3cbeec3eb135df275a4cda0ab
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
index d2eb9ab53817..8f9c130d646d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=11.0.0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9639dade4206dc9aac30b658a026ba22
+_md5_=fe6769fd950f9592149b8d337b822717
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999
index 08b3135bfaff..6aea01d10157 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=12.0.0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9639dade4206dc9aac30b658a026ba22
+_md5_=fe6769fd950f9592149b8d337b822717
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
deleted file mode 100644
index de232c114635..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.8 >=dev-python/lit-5[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-10.0.0*:10 sys-libs/compiler-rt:10.0.0 ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
-KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=10.0.0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a279505900070a816a15136e30aa341
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999
index a81fd2783020..795c801f3129 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999
@@ -4,11 +4,11 @@ DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
+IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc test
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
-RESTRICT=!test? ( test ) !clang? ( test )
+RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=11.0.0
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=afcf39211333c564f18be05a1a4bc9d9
+_md5_=3c35d617e3e0e9461f5a9dfb13624942
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0.9999
index 46bb473c2230..05e0048b13bc 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0.9999
@@ -4,11 +4,11 @@ DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
+IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc test
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
-RESTRICT=!test? ( test ) !clang? ( test )
+RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=12.0.0
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=afcf39211333c564f18be05a1a4bc9d9
+_md5_=3c35d617e3e0e9461f5a9dfb13624942
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.0 b/metadata/md5-cache/sys-libs/libcxx-10.0.0
deleted file mode 100644
index 933ac2d2bcf2..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-10.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-10.0.0[libunwind=,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(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=7
-HOMEPAGE=https://libcxx.llvm.org/
-IUSE=elibc_glibc elibc_musl +libcxxabi +libunwind +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=amd64 arm arm64 x86
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-10.0.0[libunwind=,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(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-REQUIRED_USE=libunwind? ( libcxxabi )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40a747745dd77cf91bd8507e7d9a644d
diff --git a/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
index 1244dd0df6e6..a545561873fb 100644
--- a/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d71a9ad40620c1075e931f52d58acbcc
+_md5_=83571f434b77398a6a5b810d04043fa9
diff --git a/metadata/md5-cache/sys-libs/libcxx-12.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-12.0.0.9999
index 8beba2c93554..e5ee67287b5f 100644
--- a/metadata/md5-cache/sys-libs/libcxx-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-12.0.0.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d71a9ad40620c1075e931f52d58acbcc
+_md5_=83571f434b77398a6a5b810d04043fa9
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0
deleted file mode 100644
index a379b71cc4eb..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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/llvm-libunwind-3.9.0-r1[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-devel/llvm-6 !!sys-devel/llvm:0
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=7
-HOMEPAGE=https://libcxxabi.llvm.org/
-IUSE=+libunwind +static-libs test elibc_musl 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 x86
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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/llvm-libunwind-3.9.0-r1[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(-)?] ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2360129f90ebbf31b290a6ae48d932ca
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
index 61f59eb4a37c..37b8b72779c3 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
@@ -4,11 +4,11 @@ DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-
 DESCRIPTION=Low level support for a standard C++ library
 EAPI=7
 HOMEPAGE=https://libcxxabi.llvm.org/
-IUSE=+libunwind +static-libs test elibc_musl 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=+libunwind +static-libs test elibc_musl 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=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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/llvm-libunwind-3.9.0-r1[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(-)?] ) )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe5e9339c0b00384c5a5c9c0db72d5d0
+_md5_=99a58284d2818fe272894ca9ef785bad
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-12.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-12.0.0.9999
index 61f59eb4a37c..37b8b72779c3 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-12.0.0.9999
@@ -4,11 +4,11 @@ DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-
 DESCRIPTION=Low level support for a standard C++ library
 EAPI=7
 HOMEPAGE=https://libcxxabi.llvm.org/
-IUSE=+libunwind +static-libs test elibc_musl 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=+libunwind +static-libs test elibc_musl 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=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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/llvm-libunwind-3.9.0-r1[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(-)?] ) )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe5e9339c0b00384c5a5c9c0db72d5d0
+_md5_=99a58284d2818fe272894ca9ef785bad
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.0 b/metadata/md5-cache/sys-libs/libomp-10.0.0
deleted file mode 100644
index 276c0067422f..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-10.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig ) test? ( || ( ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=hwloc? ( sys-apps/hwloc: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(-)?] ) offload? ( virtual/libelf:=[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/libffi:=[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:= ) )
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=7
-HOMEPAGE=https://openmp.llvm.org
-IUSE=cuda hwloc kernel_linux offload ompt 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 kernel_linux
-KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=hwloc? ( sys-apps/hwloc: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(-)?] ) offload? ( virtual/libelf:=[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/libffi:=[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:= ) )
-REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1336fdbcc6942e3b52673cc7968012a6
diff --git a/metadata/md5-cache/sys-libs/libomp-11.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-11.0.0.9999
index 5516c127d796..744968f3c293 100644
--- a/metadata/md5-cache/sys-libs/libomp-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-11.0.0.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c2b66326e1c98ab7ec04eb6df7e0716
+_md5_=fd02b832218f4dcc433eeda7cb7721b9
diff --git a/metadata/md5-cache/sys-libs/libomp-12.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-12.0.0.9999
index 1c7ed82722e7..c351bf88fb64 100644
--- a/metadata/md5-cache/sys-libs/libomp-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-12.0.0.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46fff83c8a09d6bf0cbb084b818ef6be
+_md5_=25a75ca58176cc1b90df269a8e29827b
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.17 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.17
index fbff567d2ef1..2d4165e6f6a5 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.17
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.17
@@ -5,7 +5,7 @@ DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
 EAPI=7
 HOMEPAGE=https://github.com/besser82/libxcrypt
 IUSE=+compat split-usr +static-libs system 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+ public-domain BSD BSD-2
 RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) !sys-libs/musl )
 REQUIRED_USE=split-usr? ( system )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/besser82/libxcrypt/archive/v4.4.17.tar.gz -> libxcrypt-4.4.17.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d03b569026c24a2f847e90725c13fa27
+_md5_=3743102a0af4cef195eadee5e00fa50e
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
deleted file mode 100644
index a5c5b64126fe..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=7
-HOMEPAGE=https://github.com/llvm-mirror/libunwind
-IUSE=debug +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=amd64 arm arm64 x86
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!sys-libs/libunwind
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b39a25bac319f8476abb434ec2502e4d
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999
index 683fc78a6391..3cce7716dfd5 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999
@@ -4,11 +4,11 @@ DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
 DESCRIPTION=C++ runtime stack unwinder from LLVM
 EAPI=7
 HOMEPAGE=https://github.com/llvm-mirror/libunwind
-IUSE=debug +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
+IUSE=debug +static-libs test 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=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RDEPEND=!sys-libs/libunwind
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2bc455a315eb7e4e54cebd94c549cabc
+_md5_=0a56ba55f87b43835462bb5f98f7cab6
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0.9999
index 683fc78a6391..3cce7716dfd5 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0.9999
@@ -4,11 +4,11 @@ DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
 DESCRIPTION=C++ runtime stack unwinder from LLVM
 EAPI=7
 HOMEPAGE=https://github.com/llvm-mirror/libunwind
-IUSE=debug +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
+IUSE=debug +static-libs test 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=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RDEPEND=!sys-libs/libunwind
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2bc455a315eb7e4e54cebd94c549cabc
+_md5_=0a56ba55f87b43835462bb5f98f7cab6
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2020d b/metadata/md5-cache/sys-libs/timezone-data-2020d
index 1bef9c3fedef..7c4db38af6e9 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2020d
+++ b/metadata/md5-cache/sys-libs/timezone-data-2020d
@@ -4,10 +4,10 @@ DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdum
 EAPI=7
 HOMEPAGE=https://www.iana.org/time-zones
 IUSE=nls leaps-timezone elibc_FreeBSD zic-slim
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD public-domain
 RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
 SLOT=0
 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2020d.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2020d.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a3b3bada73e3ab439304b4d45bd8942
+_md5_=e7e95e18c384e28096222676bd5e8d00
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 3734854dd578..a7d4794d95a3 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/parallel-20201122 b/metadata/md5-cache/sys-process/parallel-20201122
index aab50392cb91..2049bc8d4e73 100644
--- a/metadata/md5-cache/sys-process/parallel-20201122
+++ b/metadata/md5-cache/sys-process/parallel-20201122
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl
 DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20201122.tar.bz2
-_md5_=246f6e6fd7315cd9088ba5c9e152e691
+_md5_=42809ce3135fde6dc9b8441ae16c8f07
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index e204e08e12d0..9abf69fc0e9d 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.76.0-r1 b/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.76.0-r1
index ec42da98ffdf..3881b90097ac 100644
--- a/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.76.0-r1
+++ b/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.76.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for HTTP-Tiny
 EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos
 RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/HTTP-Tiny-0.76.0 ) dev-lang/perl:= !<perl-core/HTTP-Tiny-0.76.0 !>perl-core/HTTP-Tiny-0.76.0-r999
 SLOT=0
-_md5_=beb33aae6c90ae502a99578272da76aa
+_md5_=7eede17cccf7f74732c485c89e2dcad0
diff --git a/metadata/md5-cache/virtual/tmpfiles-0 b/metadata/md5-cache/virtual/tmpfiles-0
index 53cfc8a01316..a4aaf510f296 100644
--- a/metadata/md5-cache/virtual/tmpfiles-0
+++ b/metadata/md5-cache/virtual/tmpfiles-0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to select between different tmpfiles.d handlers
 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( sys-apps/opentmpfiles sys-apps/systemd sys-apps/systemd-tmpfiles )
+RDEPEND=|| ( sys-apps/systemd-tmpfiles sys-apps/opentmpfiles sys-apps/systemd )
 SLOT=0
-_md5_=eadba3f9ca6fd32b870319f375c3d3c5
+_md5_=fdceb95fbce47ceba265b9555e084330
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index a86f70e06edd..b13fd8932928 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/firefox-83.0 b/metadata/md5-cache/www-client/firefox-83.0
index 725dccae5d3a..a13eb7417522 100644
--- a/metadata/md5-cache/www-client/firefox-83.0
+++ b/metadata/md5-cache/www-client/firefox-83.0
@@ -10,6 +10,6 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.58 >=dev-libs/nspr-4.29 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 )
 SLOT=0/83
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/83.0/source/firefox-83.0.source.tar.xz -> firefox-83.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-83-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-83-patches-04.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-83-patches-04.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ach.xpi -> firefox-83.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/af.xpi -> firefox-83.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/an.xpi -> firefox-83.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ar.xpi -> firefox-83.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ast.xpi -> firefox-83.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/az.xpi -> firefox-83.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/be.xpi -> firefox-83.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bg.xpi -> firefox-83.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bn.xpi -> firefox-83.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/br.xpi -> firefox-83.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bs.xpi -> firefox-83.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-83.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ca.xpi -> firefox-83.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cak.xpi -> firefox-83.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cs.xpi -> firefox-83.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cy.xpi -> firefox-83.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/da.xpi -> firefox-83.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/de.xpi -> firefox-83.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/dsb.xpi -> firefox-83.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/el.xpi -> firefox-83.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/en-CA.xpi -> firefox-83.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/en-GB.xpi -> firefox-83.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/eo.xpi -> firefox-83.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-AR.xpi -> firefox-83.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-CL.xpi -> firefox-83.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-ES.xpi -> firefox-83.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-MX.xpi -> firefox-83.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/et.xpi -> firefox-83.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/eu.xpi -> firefox-83.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fa.xpi -> firefox-83.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ff.xpi -> firefox-83.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fi.xpi -> firefox-83.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fr.xpi -> firefox-83.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-83.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-83.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gd.xpi -> firefox-83.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gl.xpi -> firefox-83.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gn.xpi -> firefox-83.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-83.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/he.xpi -> firefox-83.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-83.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hr.xpi -> firefox-83.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hsb.xpi -> firefox-83.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hu.xpi -> firefox-83.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-83.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ia.xpi -> firefox-83.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/id.xpi -> firefox-83.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/is.xpi -> firefox-83.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/it.xpi -> firefox-83.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ja.xpi -> firefox-83.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ka.xpi -> firefox-83.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kab.xpi -> firefox-83.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kk.xpi -> firefox-83.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/km.xpi -> firefox-83.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kn.xpi -> firefox-83.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ko.xpi -> firefox-83.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lij.xpi -> firefox-83.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lt.xpi -> firefox-83.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lv.xpi -> firefox-83.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/mk.xpi -> firefox-83.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/mr.xpi -> firefox-83.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ms.xpi -> firefox-83.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/my.xpi -> firefox-83.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-83.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-83.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nl.xpi -> firefox-83.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-83.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/oc.xpi -> firefox-83.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-83.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pl.xpi -> firefox-83.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-83.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-83.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/rm.xpi -> firefox-83.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ro.xpi -> firefox-83.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ru.xpi -> firefox-83.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/si.xpi -> firefox-83.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sk.xpi -> firefox-83.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sl.xpi -> firefox-83.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/son.xpi -> firefox-83.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sq.xpi -> firefox-83.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sr.xpi -> firefox-83.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-83.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ta.xpi -> firefox-83.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/te.xpi -> firefox-83.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/th.xpi -> firefox-83.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/tl.xpi -> firefox-83.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/tr.xpi -> firefox-83.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/trs.xpi -> firefox-83.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/uk.xpi -> firefox-83.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ur.xpi -> firefox-83.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/uz.xpi -> firefox-83.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/vi.xpi -> firefox-83.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/xh.xpi -> firefox-83.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-83.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-83.0-zh-TW.xpi )
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/83.0/source/firefox-83.0.source.tar.xz -> firefox-83.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-83-patches-05.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-83-patches-05.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-83-patches-05.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ach.xpi -> firefox-83.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/af.xpi -> firefox-83.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/an.xpi -> firefox-83.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ar.xpi -> firefox-83.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ast.xpi -> firefox-83.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/az.xpi -> firefox-83.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/be.xpi -> firefox-83.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bg.xpi -> firefox-83.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bn.xpi -> firefox-83.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/br.xpi -> firefox-83.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bs.xpi -> firefox-83.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-83.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ca.xpi -> firefox-83.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cak.xpi -> firefox-83.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cs.xpi -> firefox-83.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cy.xpi -> firefox-83.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/da.xpi -> firefox-83.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/de.xpi -> firefox-83.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/dsb.xpi -> firefox-83.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/el.xpi -> firefox-83.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/en-CA.xpi -> firefox-83.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/en-GB.xpi -> firefox-83.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/eo.xpi -> firefox-83.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-AR.xpi -> firefox-83.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-CL.xpi -> firefox-83.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-ES.xpi -> firefox-83.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-MX.xpi -> firefox-83.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/et.xpi -> firefox-83.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/eu.xpi -> firefox-83.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fa.xpi -> firefox-83.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ff.xpi -> firefox-83.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fi.xpi -> firefox-83.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fr.xpi -> firefox-83.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-83.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-83.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gd.xpi -> firefox-83.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gl.xpi -> firefox-83.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gn.xpi -> firefox-83.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-83.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/he.xpi -> firefox-83.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-83.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hr.xpi -> firefox-83.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hsb.xpi -> firefox-83.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hu.xpi -> firefox-83.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-83.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ia.xpi -> firefox-83.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/id.xpi -> firefox-83.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/is.xpi -> firefox-83.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/it.xpi -> firefox-83.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ja.xpi -> firefox-83.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ka.xpi -> firefox-83.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kab.xpi -> firefox-83.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kk.xpi -> firefox-83.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/km.xpi -> firefox-83.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kn.xpi -> firefox-83.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ko.xpi -> firefox-83.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lij.xpi -> firefox-83.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lt.xpi -> firefox-83.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lv.xpi -> firefox-83.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/mk.xpi -> firefox-83.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/mr.xpi -> firefox-83.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ms.xpi -> firefox-83.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/my.xpi -> firefox-83.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-83.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-83.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nl.xpi -> firefox-83.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-83.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/oc.xpi -> firefox-83.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-83.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pl.xpi -> firefox-83.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-83.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-83.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/rm.xpi -> firefox-83.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ro.xpi -> firefox-83.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ru.xpi -> firefox-83.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/si.xpi -> firefox-83.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sk.xpi -> firefox-83.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sl.xpi -> firefox-83.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/son.xpi -> firefox-83.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sq.xpi -> firefox-83.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sr.xpi -> firefox-83.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-83.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ta.xpi -> firefox-83.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/te.xpi -> firefox-83.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/th.xpi -> firefox-83.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/tl.xpi -> firefox-83.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/tr.xpi -> firefox-83.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/trs.xpi -> firefox-83.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/uk.xpi -> firefox-83.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ur.xpi -> firefox-83.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/uz.xpi -> firefox-83.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/vi.xpi -> firefox-83.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/xh.xpi -> firefox-83.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-83.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-83.0-zh-TW.xpi )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1c86ffa917913d47235e6b6ec048a0e
+_md5_=de99b3626bcd8c74cb7d27ab24643ec0
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index dc5b48c39bb3..58611e854ff2 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/gatling-0.15 b/metadata/md5-cache/www-servers/gatling-0.15
index d3435cfc749a..796c4fde4e02 100644
--- a/metadata/md5-cache/www-servers/gatling-0.15
+++ b/metadata/md5-cache/www-servers/gatling-0.15
@@ -11,4 +11,4 @@ REQUIRED_USE=ssl? ( !diet )
 SLOT=0
 SRC_URI=https://www.fefe.de/gatling/gatling-0.15.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c2d8e604f5c156a56677ee4ea44f11d9
+_md5_=0ac092c99485487b30230799612496c9
diff --git a/metadata/md5-cache/www-servers/gatling-0.16 b/metadata/md5-cache/www-servers/gatling-0.16
new file mode 100644
index 000000000000..a662528df2fe
--- /dev/null
+++ b/metadata/md5-cache/www-servers/gatling-0.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=>=dev-libs/libowfat-0.32-r2[diet=] diet? ( dev-libs/dietlibc ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) )
+DESCRIPTION=High performance web server
+EAPI=7
+HOMEPAGE=https://www.fefe.de/gatling/
+IUSE=libressl ssl diet
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libowfat-0.32-r2[diet=] diet? ( dev-libs/dietlibc ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) )
+REQUIRED_USE=ssl? ( !diet )
+SLOT=0
+SRC_URI=https://www.fefe.de/gatling/gatling-0.16.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=03682d082287a59a9699fce1f6aff9d6
diff --git a/metadata/md5-cache/www-servers/gunicorn-20.0.4 b/metadata/md5-cache/www-servers/gunicorn-20.0.4
index 50eb28ad26c7..4d7ae9e571ae 100644
--- a/metadata/md5-cache/www-servers/gunicorn-20.0.4
+++ b/metadata/md5-cache/www-servers/gunicorn-20.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=A WSGI HTTP Server for UNIX
 EAPI=7
 HOMEPAGE=https://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT PSF-2 doc? ( BSD )
 RDEPEND=dev-python/setproctitle[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-20.0.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5f9e7552a6514476a3b5d8ac9e948d49
+_md5_=1edc3895f1b3c9eec5133ed3738c8a40
diff --git a/metadata/md5-cache/www-servers/sniproxy-0.6.0 b/metadata/md5-cache/www-servers/sniproxy-0.6.0
deleted file mode 100644
index 2c89a50bacb7..000000000000
--- a/metadata/md5-cache/www-servers/sniproxy-0.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libev >=dev-libs/libpcre-3 dns? ( net-libs/udns ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=test? ( net-misc/curl )
-DESCRIPTION=Proxies incoming HTTP and TLS connections based on the hostname
-EAPI=7
-HOMEPAGE=https://github.com/dlundquist/sniproxy
-IUSE=+dns +largefile rfc3339 test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-libs/libev >=dev-libs/libpcre-3 dns? ( net-libs/udns )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dlundquist/sniproxy/archive/0.6.0.tar.gz -> sniproxy-0.6.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=893381be872fcd0d0d14a41dd90a272e
diff --git a/metadata/md5-cache/www-servers/sniproxy-0.6.0-r1 b/metadata/md5-cache/www-servers/sniproxy-0.6.0-r1
new file mode 100644
index 000000000000..4dd941187429
--- /dev/null
+++ b/metadata/md5-cache/www-servers/sniproxy-0.6.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=acct-group/sniproxy acct-user/sniproxy dev-libs/libev >=dev-libs/libpcre-3 dns? ( net-libs/udns ) test? ( net-misc/curl )
+DESCRIPTION=Proxies incoming HTTP and TLS connections based on the hostname
+EAPI=7
+HOMEPAGE=https://github.com/dlundquist/sniproxy
+IUSE=+dns +largefile rfc3339 test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=acct-group/sniproxy acct-user/sniproxy dev-libs/libev >=dev-libs/libpcre-3 dns? ( net-libs/udns )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dlundquist/sniproxy/archive/0.6.0.tar.gz -> sniproxy-0.6.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=28af41b69ca6fd1bebaf057b14948296
diff --git a/metadata/md5-cache/www-servers/tornado-6.0.4 b/metadata/md5-cache/www-servers/tornado-6.0.4
index 1de750157de6..de34c7b4af63 100644
--- a/metadata/md5-cache/www-servers/tornado-6.0.4
+++ b/metadata/md5-cache/www-servers/tornado-6.0.4
@@ -5,7 +5,7 @@ DESCRIPTION=Python web framework and asynchronous networking library
 EAPI=7
 HOMEPAGE=https://www.tornadoweb.org/
 IUSE=examples test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pycurl-7.19.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/twisted-16.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-6.0.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=958419ff60f483d4336d984499aeb43a
+_md5_=1960da587da60339aeeebbe5e96f7208
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 5a7437a2540b..4105665afc4c 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
index 2dbe0b75e798..9c3542f713ce 100644
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
@@ -5,10 +5,10 @@ DESCRIPTION=LightDM GTK+ Greeter
 EAPI=7
 HOMEPAGE=https://github.com/Xubuntu/lightdm-gtk-greeter
 IUSE=appindicator branding
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
 RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
 SLOT=0
 SRC_URI=https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4981b9339bfb9684197446907f450f53
+_md5_=086be545c04bdd49113ac38ce3297882
diff --git a/metadata/md5-cache/x11-misc/xsri-2.1.0-r3 b/metadata/md5-cache/x11-misc/xsri-2.1.0-r3
deleted file mode 100644
index afcd2337042d..000000000000
--- a/metadata/md5-cache/x11-misc/xsri-2.1.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=The xsri wallpaper setter from RedHat
-EAPI=5
-HOMEPAGE=http://fedoraproject.org
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/source/SRPMS/xsri-2.1.0-17.fc12.src.rpm
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=012e7290f67901be8a306994c6957955
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 8d2edbb452d5..d6e570af8185 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.7 b/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.7
new file mode 100644
index 000000000000..b977e7b3432b
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.7
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=postinst
+DEPEND=dev-libs/json-glib net-im/pidgin
+DESCRIPTION=SkypeWeb Plugin for Pidgin
+EAPI=7
+HOMEPAGE=https://github.com/EionRobb/skype4pidgin
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/json-glib net-im/pidgin
+SLOT=0
+SRC_URI=https://github.com/EionRobb/skype4pidgin/archive/1.7.tar.gz -> pidgin-skypeweb-1.7.tar.gz
+_md5_=a583bec16c080f0d9ef25936487c45dd
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index b36ba5f1123f..2be5dfc9b890 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/mrxvt-0.5.4 b/metadata/md5-cache/x11-terms/mrxvt-0.5.4
index 6ade3c813f64..e35f94d57db3 100644
--- a/metadata/md5-cache/x11-terms/mrxvt-0.5.4
+++ b/metadata/md5-cache/x11-terms/mrxvt-0.5.4
@@ -1,14 +1,14 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=png? ( media-libs/libpng ) utempter? ( sys-libs/libutempter ) jpeg? ( virtual/jpeg ) truetype? ( x11-libs/libXft media-libs/fontconfig media-libs/freetype elibc_uclibc? ( dev-libs/libiconv ) ) x11-libs/libX11 x11-libs/libXt xpm? ( x11-libs/libXpm ) x11-libs/libXrender x11-base/xorg-proto
+DEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:= ) truetype? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft elibc_uclibc? ( dev-libs/libiconv ) ) utempter? ( sys-libs/libutempter ) xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
 DESCRIPTION=Multi-tabbed rxvt clone with XFT, transparent background and CJK support
 EAPI=7
 HOMEPAGE=http://materm.sourceforge.net/
 IUSE=debug png jpeg session truetype menubar utempter xpm l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW
 KEYWORDS=~alpha amd64 ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=png? ( media-libs/libpng ) utempter? ( sys-libs/libutempter ) jpeg? ( virtual/jpeg ) truetype? ( x11-libs/libXft media-libs/fontconfig media-libs/freetype elibc_uclibc? ( dev-libs/libiconv ) ) x11-libs/libX11 x11-libs/libXt xpm? ( x11-libs/libXpm ) x11-libs/libXrender
+RDEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:= ) truetype? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft elibc_uclibc? ( dev-libs/libiconv ) ) utempter? ( sys-libs/libutempter ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ab549907e77a7b8edee703d6ecb65d94
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2a1b0a08a610cb06a806e1b7a6985b6e
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index a12bea7f33b5..48ddcf0215f6 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1-r1
similarity index 74%
rename from metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1
rename to metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1-r1
index 04663666768d..1eac984f32bf 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 x11-libs/gtk+:3 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=gnome-base/librsvg-2.48:2 x11-libs/gtk+:3 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNOME default icon theme
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 IUSE=branding
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
-RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2
+RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=gnome-base/librsvg-2.48:2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.36/adwaita-icon-theme-3.36.1.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d75832c55280291f75c3491b9a555267
+_md5_=1f0015ea68f919455bc9980303d0b54e
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index fbb55086c4d4..4e8341a13c4e 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/aewm-1.3.12 b/metadata/md5-cache/x11-wm/aewm-1.3.12
deleted file mode 100644
index 997b59d824ec..000000000000
--- a/metadata/md5-cache/x11-wm/aewm-1.3.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=A minimalistic X11 window manager
-EAPI=5
-HOMEPAGE=https://www.red-bean.com/decklin/aewm/
-KEYWORDS=amd64 ppc x86
-LICENSE=MIT 9wm
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft
-SLOT=0
-SRC_URI=https://www.red-bean.com/decklin/aewm/aewm-1.3.12.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a1dc600d2326f986c49adb6339bebe6
diff --git a/metadata/md5-cache/x11-wm/fvwm-2.6.5-r3 b/metadata/md5-cache/x11-wm/fvwm-2.6.5-r3
deleted file mode 100644
index 7ca6ffd290cd..000000000000
--- a/metadata/md5-cache/x11-wm/fvwm-2.6.5-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( dev-libs/fribidi ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto doc? ( dev-libs/libxslt ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An extremely powerful ICCCM-compliant multiple virtual desktop window manager
-EAPI=5
-HOMEPAGE=http://www.fvwm.org/
-IUSE=bidi debug doc gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2 FVWM
-RDEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( dev-libs/fribidi ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) dev-lang/perl gtk2-perl? ( dev-perl/Gtk2 ) perl? ( tk? ( dev-lang/tk dev-perl/Tk >=dev-perl/X11-Protocol-0.56 ) ) rplay? ( media-sound/rplay ) lock? ( x11-misc/xlockmore ) userland_GNU? ( sys-apps/debianutils ) !x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
-SLOT=0
-SRC_URI=ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-2.6.5.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ae8beba7dfcb7af94cb21397b9022074
diff --git a/metadata/md5-cache/x11-wm/goomwwm-1.0.0 b/metadata/md5-cache/x11-wm/goomwwm-1.0.0
deleted file mode 100644
index cac80b9835f3..000000000000
--- a/metadata/md5-cache/x11-wm/goomwwm-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libXft x11-libs/libX11 x11-libs/libXinerama virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Get out of my way, Window Manager!
-EAPI=5
-HOMEPAGE=http://aerosuidae.net/goomwwm/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXft x11-libs/libX11 x11-libs/libXinerama
-SLOT=0
-SRC_URI=http://aerosuidae.net/goomwwm/goomwwm-1.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1fa1b9769a37c58785e430a5197b2b88
diff --git a/metadata/md5-cache/x11-wm/pekwm-0.1.17-r2 b/metadata/md5-cache/x11-wm/pekwm-0.1.17-r2
index 45963bec4bbe..de7439955acc 100644
--- a/metadata/md5-cache/x11-wm/pekwm-0.1.17-r2
+++ b/metadata/md5-cache/x11-wm/pekwm-0.1.17-r2
@@ -5,10 +5,10 @@ DESCRIPTION=A lightweight window manager initially based on aewm++
 EAPI=7
 HOMEPAGE=https://www.pekwm.org/ https://github.com/pekdon/pekwm
 IUSE=contrib debug themes truetype xinerama
-KEYWORDS=~amd64 ~mips ~ppc ~x86
+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 )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=631235b8c1dfcb9270450dc463f403b4
+_md5_=6138c64e1e9395aad6234bfa8d9eccb6
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d3161791aaf1..c8609d0d1ddc 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 12077 BLAKE2B 2f3ed2165704c3f21cd4304fe3c7b1c7220549685a7eaa2b3e7c032afad54f4636d2f0b3a9ec4d5d71d15b7b035403e2ef7a90326cff0da0eaf8ffd7e4fac1aa SHA512 f30fcba11723fbc57f0bea029403880a3ba6f50c0d547ae57a3947cb791df5cb0e16dcf31a4810562ece91b1fc646aa82b76a7ef6f7a60e3a0bdd95f0bc0a165
-TIMESTAMP 2020-11-28T07:08:42Z
+TIMESTAMP 2020-11-29T09:08:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/B93pfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/DZRdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBY1xAAoJMVM3OoeQ4SVENO/1eKsUZ2vWur3JxI0zdBDKoz2vxhkHzbnJVv0dmI
-jxE7L8B2VOQx2+9fhpIJjnhquTwQy7Snr2bJnUM0WcISWVtzbK/dUqGys+fg5H9N
-cL2ZNEW3vGyOW/+yjFp07R0cuy4GrFKkW4r/XbDfnL6aLtWLsUL25J1F0CYU+b98
-RAQmy612OJalQdGS7KUbkcIDCtsJi846FKw9uZPNDMIUoLZjOffYVJYEy7Tuxcxo
-gsDaBiKuL6Tx3zmNDGiA1Lc/+mlmiIVFX1+EL6QJ8gCkLHHq8WRByZ3gaGoixhUZ
-la43DN/a/oEjmZ03paOq0Yv4vwbW3nxrVOpxjL/hedAD3RlToBFEknri2lTv/pG2
-lZI1+G+afw7vRtyVLbKOj3fcMu3oKcB+MLWfIkpS7CIa0Ef6ZsIq1DB/jwspIYcE
-ZbovxllZ3o52yQkXH4ANto+WfzSIh0++Ow9yboQ2zWRcy0wCT2DTJpOnujwOtRlj
-pRwYHSX3i0eemx+OxdqPS7qWbfSGJ1j8wR7Hx5sRwX6akyXBpDNBDiqQ61dNWid8
-rZzj9N86NFfg05L6CfT3b0lVbFj7w5y6yDRnNzxzQEg/lHHi//2Nc8yrLg4d+rcj
-QPWVeskjLbOUeOudPa6Oa4cT6tmnr5SopK4pGQEXSjlPKPn05cg=
-=2Ahq
+klDWWhAAhHrKT0ptKpgkE0dhzZjc9KFK61dZJenpRdFTWn0wfJMfpwuE7j8q+R7k
+0fX/gVCj8zAgX988QMhZIc3rwXRjqEDRdZvS1YNZs/DkWzR/EzrBPV7vGUiDSJgm
+EZali2PfvQG4Bh3TCLYKUNKumcDwbeH1rC8O1SqGCyisRq0O0RA62sLAjeh39WFH
+abTgyHHo7zon2el93+4IC9rnllA1qLAM9gxKa2ZnGd0J1QsfhL5rEy6nPAHrLzQn
+v1vOA2Qjol2i4q30gfMqv5PyovAmNOiAS8OhSj5Fi8fK5yx5ZWq28A+pQeHIJlnP
+52ewDgKwGKKoECKITM2aD1X/7JEokJggz0Z0UU5PTMNcc2SeQn2L2p5lGb+Ze6MJ
+lwDs9ysj0X1PGAGS4g9I2kp9bIeRz8vfninfet45wXvnlScabfAx7XcU3ZRyOpsA
+OGWZJCP8eA7Y1yLFY4mebcmfZipGc2uMedLJeiOPxAeMu0ZokWT6tOGQrvtzNUFE
+3yXILL00UCuWQ7+/LUtw8POS4ZvZiUaAaZq2ZXKqlsUzYsiU/6pdmvLf8WM7nWUq
+ml8uSZM1Ob205eEtn5rFJN8H12DcKJpPnJGPXQNpYkX+phWa3fKtoKoqWRuljYXq
+fbfYgjNzbbVxlQY1KWFXqb4sCPrDKadth2kmIkPm+nZzeJPj7M8=
+=ltp/
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5cc4f5563aa0..26a4e69091e7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Nov 2020 07:08:39 +0000
+Sun, 29 Nov 2020 09:08:36 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c92137258c94..1a7d688ee242 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat 28 Nov 2020 07:08:38 AM UTC
+Sun 29 Nov 2020 09:08:36 AM UTC
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 282e13ab0c85..625a463325e6 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -259,6 +259,8 @@
 2011160739 ./acct-group/ipsec/ipsec-0.ebuild
 2011272339 ./acct-group/cgit/cgit-0.ebuild
 2011280409 ./acct-group/minidlna/minidlna-0.ebuild
+2011290239 ./acct-group/sniproxy/sniproxy-0.ebuild
+2011290239 ./acct-group/ziproxy/ziproxy-0.ebuild
 1909291839 ./acct-user/alias/alias-0.ebuild
 1910161039 ./acct-user/bacula/bacula-0.ebuild
 1909271939 ./acct-user/bitcoin/bitcoin-0.ebuild
@@ -499,6 +501,8 @@
 2011151939 ./acct-user/ipsec/ipsec-0.ebuild
 2011272339 ./acct-user/cgit/cgit-0.ebuild
 2011280409 ./acct-user/minidlna/minidlna-0.ebuild
+2011290239 ./acct-user/sniproxy/sniproxy-0.ebuild
+2011290239 ./acct-user/ziproxy/ziproxy-0.ebuild
 2007201009 ./app-accessibility/accerciser/accerciser-3.36.2.ebuild
 2007290809 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
 2011090239 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
@@ -675,9 +679,8 @@
 2009281139 ./app-admin/hcloud/hcloud-1.19.1.ebuild
 2011061709 ./app-admin/hcloud/hcloud-1.20.0.ebuild
 2011031009 ./app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild
-1911242209 ./app-admin/helm/helm-2.16.1.ebuild
-2008072109 ./app-admin/helm/helm-2.16.9.ebuild
 2010250909 ./app-admin/helm/helm-3.3.4.ebuild
+2011282239 ./app-admin/helm/helm-3.4.1.ebuild
 1912111539 ./app-admin/ide-smart/ide-smart-1.4-r2.ebuild
 1712300140 ./app-admin/integrit/integrit-4.1-r1.ebuild
 2011121539 ./app-admin/keepass/keepass-2.46.ebuild
@@ -1181,7 +1184,7 @@
 2002230040 ./app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
 1806242309 ./app-benchmarks/siege/siege-4.0.4.ebuild
 2009241009 ./app-benchmarks/siege/siege-4.0.5.ebuild
-2011281009 ./app-benchmarks/siege/siege-4.0.7.ebuild
+2011291139 ./app-benchmarks/siege/siege-4.0.7.ebuild
 2011141639 ./app-benchmarks/stress-ng/stress-ng-0.11.24.ebuild
 2008091909 ./app-benchmarks/stress/stress-1.0.4-r2.ebuild
 1912110241 ./app-benchmarks/sysbench/sysbench-1.0.15-r1.ebuild
@@ -2051,7 +2054,7 @@
 2011181909 ./app-doc/geant-docs/geant-docs-4.10.6c.ebuild
 2009231339 ./app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild
 2011130009 ./app-doc/gnucash-docs/gnucash-docs-4.2.ebuild
-1912111539 ./app-doc/halibut/halibut-1.2.ebuild
+2011290239 ./app-doc/halibut/halibut-1.2.ebuild
 2004032241 ./app-doc/jargon/jargon-4.4.7-r1.ebuild
 2010111239 ./app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
 2010111239 ./app-doc/kicad-doc/kicad-doc-5.1.7.ebuild
@@ -2169,13 +2172,14 @@
 1804270508 ./app-editors/elvis/elvis-2.2.0-r7.ebuild
 2006211809 ./app-editors/elvis/elvis-2.2.0-r8.ebuild
 2011241409 ./app-editors/emacs/emacs-18.59-r13.ebuild
-2011242139 ./app-editors/emacs/emacs-23.4-r20.ebuild
-2011242139 ./app-editors/emacs/emacs-24.5-r9.ebuild
-2011242139 ./app-editors/emacs/emacs-25.3-r8.ebuild
-2011242139 ./app-editors/emacs/emacs-26.3-r3.ebuild
-2011242139 ./app-editors/emacs/emacs-27.1-r2.ebuild
-2011242139 ./app-editors/emacs/emacs-27.1.9999-r1.ebuild
-2011242139 ./app-editors/emacs/emacs-28.0.9999.ebuild
+2011281539 ./app-editors/emacs/emacs-23.4-r20.ebuild
+2011281539 ./app-editors/emacs/emacs-24.5-r9.ebuild
+2011281539 ./app-editors/emacs/emacs-25.3-r8.ebuild
+2011281539 ./app-editors/emacs/emacs-26.3-r3.ebuild
+2011281539 ./app-editors/emacs/emacs-27.1-r2.ebuild
+2011281539 ./app-editors/emacs/emacs-27.1-r3.ebuild
+2011281539 ./app-editors/emacs/emacs-27.1.9999-r1.ebuild
+2011281539 ./app-editors/emacs/emacs-28.0.9999.ebuild
 2008291509 ./app-editors/emact/emact-2.58.0.ebuild
 1910022239 ./app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
 2005101338 ./app-editors/fe/fe-2.0.ebuild
@@ -2630,8 +2634,6 @@
 2009192139 ./app-emulation/hercules/hercules-3.12.ebuild
 1702282250 ./app-emulation/hyperd/hyperd-0.7.0-r1.ebuild
 1912051009 ./app-emulation/img/img-0.5.7-r1.ebuild
-1807301609 ./app-emulation/kompose/kompose-1.16.0.ebuild
-1911250109 ./app-emulation/kompose/kompose-1.19.0.ebuild
 2011121909 ./app-emulation/kompose/kompose-1.22.0.ebuild
 2004032241 ./app-emulation/libcacard/libcacard-2.6.0.ebuild
 2011160239 ./app-emulation/libdsk/libdsk-1.5.8.ebuild
@@ -3057,7 +3059,7 @@
 2009060909 ./app-i18n/uchardet/uchardet-9999.ebuild
 2010200809 ./app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
 1807221539 ./app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
-2011170309 ./app-i18n/uim/uim-1.8.8.ebuild
+2011290239 ./app-i18n/uim/uim-1.8.8.ebuild
 1910111840 ./app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild
 2004032241 ./app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
 2005061609 ./app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild
@@ -3485,7 +3487,7 @@
 1705030952 ./app-misc/rlwrap/rlwrap-0.42-r1.ebuild
 1707262252 ./app-misc/rlwrap/rlwrap-0.43.ebuild
 1912111539 ./app-misc/rlwrap/rlwrap-0.42.ebuild
-1908291509 ./app-misc/rox-filer/rox-filer-2.11.ebuild
+2011282109 ./app-misc/rox-filer/rox-filer-2.11.ebuild
 2004060039 ./app-misc/rtlamr/rtlamr-0.9.1.ebuild
 1702282250 ./app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
 1702282250 ./app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild
@@ -3657,9 +3659,9 @@
 2010141239 ./app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild
 2010181839 ./app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
 2011230809 ./app-office/libreoffice/libreoffice-6.4.7.2.ebuild
-2011250209 ./app-office/libreoffice/libreoffice-7.0.3.1.ebuild
-2011250209 ./app-office/libreoffice/libreoffice-7.0.9999.ebuild
-2011250209 ./app-office/libreoffice/libreoffice-9999.ebuild
+2011290109 ./app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+2011290109 ./app-office/libreoffice/libreoffice-7.0.9999.ebuild
+2011290109 ./app-office/libreoffice/libreoffice-9999.ebuild
 2010231609 ./app-office/lyx/lyx-2.3.5.2-r2.ebuild
 1912210209 ./app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
 2004032241 ./app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
@@ -3835,7 +3837,7 @@
 2006141709 ./app-portage/nattka/nattka-9999.ebuild
 2009041209 ./app-portage/nattka/nattka-0.2.9.ebuild
 2009241009 ./app-portage/nattka/nattka-0.2.10.ebuild
-2011271339 ./app-portage/nattka/nattka-0.2.11.ebuild
+2011281109 ./app-portage/nattka/nattka-0.2.11.ebuild
 2005191438 ./app-portage/gander/gander-0.0.1.ebuild
 2009011409 ./app-portage/pgo/pgo-0.0.2.ebuild
 2009011409 ./app-portage/pgo/pgo-9999.ebuild
@@ -3941,7 +3943,7 @@
 1706101306 ./app-text/an/an-1.2-r1.ebuild
 1702282250 ./app-text/an/an-1.2.ebuild
 2011271939 ./app-text/an/an-1.2_p6.ebuild
-2011261139 ./app-text/ansifilter/ansifilter-2.17.ebuild
+2011281109 ./app-text/ansifilter/ansifilter-2.17.ebuild
 2002112051 ./app-text/antiword/antiword-0.37-r1.ebuild
 1801051609 ./app-text/antixls/antixls-0.3b.ebuild
 2002112051 ./app-text/apvlv/apvlv-0.1.5-r2.ebuild
@@ -3965,9 +3967,9 @@
 1912111539 ./app-text/bogosort/bogosort-0.4.2-r1.ebuild
 2004211009 ./app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
 2007020309 ./app-text/c2ps/c2ps-4.0.ebuild
-2008210739 ./app-text/calibre/calibre-4.23.0.ebuild
-2008212139 ./app-text/calibre/calibre-4.22.0.ebuild
-2011012139 ./app-text/calibre/calibre-5.4.2.ebuild
+2011290209 ./app-text/calibre/calibre-4.22.0.ebuild
+2011290209 ./app-text/calibre/calibre-4.23.0.ebuild
+2011290209 ./app-text/calibre/calibre-5.4.2.ebuild
 2001081609 ./app-text/capyt/capyt-1.1.1.ebuild
 2002171539 ./app-text/catdoc/catdoc-0.95-r1.ebuild
 2010240239 ./app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
@@ -4032,7 +4034,7 @@
 2006161409 ./app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
 2008310409 ./app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
 2007221209 ./app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
-2007212309 ./app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+2011281239 ./app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
 1911170839 ./app-text/docx2txt/docx2txt-1.4.ebuild
 2003261841 ./app-text/dos2unix/dos2unix-7.4.1.ebuild
 2004032241 ./app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -4319,7 +4321,7 @@
 2004032241 ./app-text/wdiff/wdiff-1.2.2.ebuild
 2011271939 ./app-text/wdiff/wdiff-1.2.2-r1.ebuild
 2007220739 ./app-text/webgen/webgen-1.7.1.ebuild
-2007231439 ./app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
+2011281109 ./app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
 2002101509 ./app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
 1906182139 ./app-text/writerperfect/writerperfect-0.9.6.ebuild
 2009262309 ./app-text/wscr/wscr-1.2-r2.ebuild
@@ -4565,7 +4567,7 @@
 1811170209 ./app-vim/tlib/tlib-1.23.ebuild
 2004032241 ./app-vim/tmpl/tmpl-0.1-r1.ebuild
 2004032241 ./app-vim/toggle/toggle-0.5-r1.ebuild
-1910111840 ./app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
+2011281309 ./app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
 1803110208 ./app-vim/txtfmt/txtfmt-2.4-r1.ebuild
 1803110208 ./app-vim/txtfmt/txtfmt-3.1.ebuild
 2004051339 ./app-vim/udev-syntax/udev-syntax-20051016-r2.ebuild
@@ -5071,7 +5073,7 @@
 2004161839 ./dev-cpp/tbb/tbb-2019.8.ebuild
 2007160139 ./dev-cpp/tbb/tbb-2020.3.ebuild
 1905202039 ./dev-cpp/tclap/tclap-1.2.1.ebuild
-1808221139 ./dev-cpp/tclap/tclap-1.2.2.ebuild
+2011291139 ./dev-cpp/tclap/tclap-1.2.2.ebuild
 1912150039 ./dev-cpp/tree/tree-2.81.ebuild
 1812131839 ./dev-cpp/waylandpp/waylandpp-0.2.3.ebuild
 2002112051 ./dev-cpp/waylandpp/waylandpp-0.2.4.ebuild
@@ -5100,6 +5102,7 @@
 2011251109 ./dev-cpp/prometheus-cpp/prometheus-cpp-0.11.0.ebuild
 2010090039 ./dev-cpp/robin-map/robin-map-9999.ebuild
 2011121939 ./dev-cpp/robin-map/robin-map-0.6.3.ebuild
+2011282309 ./dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild
 1912111539 ./dev-db/4store/4store-1.1.5-r1.ebuild
 1805250908 ./dev-db/aerospike-server-community/aerospike-server-community-4.1.0.1.ebuild
 1811172139 ./dev-db/aerospike-server-community/aerospike-server-community-9999.ebuild
@@ -5140,7 +5143,6 @@
 2004032241 ./dev-db/libiodbc/libiodbc-3.52.12.ebuild
 2002230040 ./dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild
 2002181709 ./dev-db/libzdb/libzdb-3.1-r1.ebuild
-2002181709 ./dev-db/libzdb/libzdb-3.1.ebuild
 1702282250 ./dev-db/lmdb++/lmdb++-0.9.14.0.ebuild
 2003261841 ./dev-db/lmdb/lmdb-0.9.24.ebuild
 2004032241 ./dev-db/lmdb/lmdb-0.9.23.ebuild
@@ -5161,9 +5163,9 @@
 2011140109 ./dev-db/mariadb/mariadb-10.2.32-r3.ebuild
 2011140239 ./dev-db/mariadb/mariadb-10.3.23-r3.ebuild
 2011140339 ./dev-db/mariadb/mariadb-10.4.13-r3.ebuild
-2011251939 ./dev-db/mariadb/mariadb-10.2.36.ebuild
-2011251939 ./dev-db/mariadb/mariadb-10.3.27.ebuild
-2011251939 ./dev-db/mariadb/mariadb-10.4.17.ebuild
+2011281239 ./dev-db/mariadb/mariadb-10.2.36.ebuild
+2011281239 ./dev-db/mariadb/mariadb-10.3.27.ebuild
+2011281239 ./dev-db/mariadb/mariadb-10.4.17.ebuild
 2003170039 ./dev-db/mongodb/mongodb-3.6.13.ebuild
 2003170039 ./dev-db/mongodb/mongodb-3.6.17.ebuild
 2009271739 ./dev-db/mongodb/mongodb-4.2.8.ebuild
@@ -5357,6 +5359,7 @@
 2008251609 ./dev-embedded/esptool/esptool-2.8.ebuild
 2010050039 ./dev-embedded/esptool/esptool-2.8-r1.ebuild
 2011130609 ./dev-embedded/esptool/esptool-2.8-r2.ebuild
+2011281239 ./dev-embedded/esptool/esptool-3.0.ebuild
 2008160609 ./dev-embedded/freaklabs-boards/freaklabs-boards-1.0.0.ebuild
 2009201709 ./dev-embedded/gnusim8085/gnusim8085-1.3.7.ebuild
 1709051022 ./dev-embedded/gpsim/gpsim-0.30.0.ebuild
@@ -6259,7 +6262,6 @@
 2008011139 ./dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
 2008011139 ./dev-haskell/x509/x509-1.7.5.ebuild
 2009022209 ./dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
-2011011639 ./dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
 2008011139 ./dev-haskell/xml-conduit/xml-conduit-1.9.0.0.ebuild
 2009042309 ./dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
 2009061209 ./dev-haskell/xml-types/xml-types-0.3.8.ebuild
@@ -7221,7 +7223,7 @@
 2002102239 ./dev-lang/jsonnet/jsonnet-0.15.0.ebuild
 2010250339 ./dev-lang/jsonnet/jsonnet-0.16.0.ebuild
 2011031039 ./dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild
-2011250909 ./dev-lang/jsonnet/jsonnet-0.17.0.ebuild
+2011290109 ./dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild
 2005012239 ./dev-lang/julia-bin/julia-bin-1.2.0.ebuild
 2005012239 ./dev-lang/julia-bin/julia-bin-1.3.0.ebuild
 2005012239 ./dev-lang/julia-bin/julia-bin-1.4.0.ebuild
@@ -7381,7 +7383,7 @@
 2011160309 ./dev-lang/spidermonkey/spidermonkey-78.4.1.ebuild
 2011262309 ./dev-lang/spidermonkey/spidermonkey-78.5.0.ebuild
 2008112209 ./dev-lang/squirrel/squirrel-3.1_p20200612.ebuild
-2002122139 ./dev-lang/srf/srf-1.0-r2.ebuild
+2011290239 ./dev-lang/srf/srf-1.0-r2.ebuild
 2009181139 ./dev-lang/swi-prolog/swi-prolog-8.2.1.ebuild
 2011041539 ./dev-lang/swi-prolog/swi-prolog-8.3.8.ebuild
 2011090239 ./dev-lang/swi-prolog/swi-prolog-8.3.9.ebuild
@@ -7626,7 +7628,7 @@
 2010301909 ./dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild
 2011061509 ./dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
 2006062038 ./dev-libs/icu/icu-67.1.ebuild
-2010301909 ./dev-libs/icu/icu-68.1.ebuild
+2011282209 ./dev-libs/icu/icu-68.1.ebuild
 2008232009 ./dev-libs/igraph/igraph-0.7.1-r2.ebuild
 2009291909 ./dev-libs/igraph/igraph-0.8.2.ebuild
 2011150209 ./dev-libs/igraph/igraph-0.8.3.ebuild
@@ -7645,7 +7647,7 @@
 2004032241 ./dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
 2004032241 ./dev-libs/ivykis/ivykis-0.42.4.ebuild
 2007241139 ./dev-libs/jansson/jansson-2.12.ebuild
-2010091209 ./dev-libs/jansson/jansson-2.13.1.ebuild
+2011281509 ./dev-libs/jansson/jansson-2.13.1.ebuild
 1805281008 ./dev-libs/jemalloc/jemalloc-4.4.0.ebuild
 1805281008 ./dev-libs/jemalloc/jemalloc-4.5.0.ebuild
 1908072339 ./dev-libs/jemalloc/jemalloc-5.0.1.ebuild
@@ -7661,7 +7663,7 @@
 2006132027 ./dev-libs/json-glib/json-glib-1.4.4.ebuild
 2011090239 ./dev-libs/json-glib/json-glib-1.6.0.ebuild
 2008091739 ./dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
-2011172239 ./dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+2011281709 ./dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
 2008302139 ./dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
 2006041239 ./dev-libs/jthread/jthread-1.3.3.ebuild
 2005090009 ./dev-libs/judy/judy-1.0.5-r2.ebuild
@@ -7683,8 +7685,8 @@
 2005312008 ./dev-libs/leatherman/leatherman-1.12.0-r1.ebuild
 2007112139 ./dev-libs/leatherman/leatherman-1.12.1.ebuild
 2008222239 ./dev-libs/leatherman/leatherman-1.12.1-r2.ebuild
-2011151309 ./dev-libs/leatherman/leatherman-1.12.2.ebuild
 2011200709 ./dev-libs/leatherman/leatherman-1.12.3.ebuild
+2011291139 ./dev-libs/leatherman/leatherman-1.12.2.ebuild
 1912312139 ./dev-libs/leveldb/leveldb-1.20.ebuild
 2001151039 ./dev-libs/leveldb/leveldb-1.18-r2.ebuild
 2004032241 ./dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
@@ -7782,7 +7784,7 @@
 2011110209 ./dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild
 2002112051 ./dev-libs/libestr/libestr-0.1.11.ebuild
 2004032241 ./dev-libs/libev/libev-4.31.ebuild
-2005120809 ./dev-libs/libev/libev-4.33.ebuild
+2011281539 ./dev-libs/libev/libev-4.33.ebuild
 2010160039 ./dev-libs/libevdev/libevdev-1.9.1.ebuild
 2010152239 ./dev-libs/libevdev/libevdev-9999.ebuild
 2011170739 ./dev-libs/libevdev/libevdev-1.10.0.ebuild
@@ -7839,8 +7841,8 @@
 2006132027 ./dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
 2006132027 ./dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
 2009231639 ./dev-libs/libinput/libinput-1.16.1.ebuild
-2010071809 ./dev-libs/libinput/libinput-1.16.2.ebuild
-2011031239 ./dev-libs/libinput/libinput-1.16.3.ebuild
+2011291139 ./dev-libs/libinput/libinput-1.16.3.ebuild
+2011281409 ./dev-libs/libinput/libinput-1.16.4.ebuild
 2004211009 ./dev-libs/libintl/libintl-0.19.7.ebuild
 2007271109 ./dev-libs/libintl/libintl-0.20.2.ebuild
 2008300439 ./dev-libs/libintl/libintl-0.20.1.ebuild
@@ -8458,34 +8460,42 @@
 1711152129 ./dev-lisp/uiop/uiop-3.3.1.ebuild
 1805051708 ./dev-lisp/uiop/uiop-3.3.2.ebuild
 2004032241 ./dev-lisp/uiop/uiop-3.1.5.ebuild
-1702282250 ./dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
-2002140109 ./dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild
-2006132027 ./dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
+2011290239 ./dev-lua/LuaBitOp/LuaBitOp-1.0.2-r100.ebuild
+2011290239 ./dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild
 1702282250 ./dev-lua/busted/busted-2.0_rc11_p0.ebuild
 1905250209 ./dev-lua/busted/busted-2.0_rc12_p1.ebuild
 2011261139 ./dev-lua/busted/busted-2.0.0.ebuild
+2011282109 ./dev-lua/busted/busted-2.0.0-r101.ebuild
 2011261139 ./dev-lua/dkjson/dkjson-2.5.ebuild
+2011281939 ./dev-lua/dkjson/dkjson-2.5-r100.ebuild
 1702282250 ./dev-lua/lanes/lanes-3.10.0.ebuild
 1907291809 ./dev-lua/ldoc/ldoc-1.4.6.ebuild
+2011290139 ./dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
 2011170309 ./dev-lua/lgi/lgi-0.9.2.ebuild
+2011290339 ./dev-lua/lgi/lgi-0.9.2-r100.ebuild
 2004171939 ./dev-lua/lpeg/lpeg-1.0.2.ebuild
 2004231939 ./dev-lua/lpeg/lpeg-1.0.1.ebuild
+2011290139 ./dev-lua/lpeg/lpeg-1.0.2-r100.ebuild
+2011290239 ./dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
 1912110241 ./dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild
 1912110241 ./dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild
 2011242139 ./dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r1.ebuild
 1905250209 ./dev-lua/lua-term/lua-term-0.3.ebuild
 2011270209 ./dev-lua/lua-term/lua-term-0.7.ebuild
+2011281939 ./dev-lua/lua-term/lua-term-0.7-r100.ebuild
 2010180309 ./dev-lua/lua-zlib/lua-zlib-1.2.ebuild
 2011140309 ./dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild
 1702282250 ./dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild
 1905250209 ./dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild
 2011270209 ./dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild
-1912110241 ./dev-lua/luacheck/luacheck-0.20.0.ebuild
-2009050239 ./dev-lua/luacheck/luacheck-0.23.0.ebuild
+2011281939 ./dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild
+2011290439 ./dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
+2011290439 ./dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
+2011290439 ./dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
 1702282250 ./dev-lua/luacov/luacov-0.8.ebuild
 2002151310 ./dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild
-2010150039 ./dev-lua/luadbi/luadbi-0.7.2-r100.ebuild
 2011151239 ./dev-lua/luadbi/luadbi-0.7.2.ebuild
+2011282109 ./dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
 1911101439 ./dev-lua/luadoc/luadoc-3.0.1.ebuild
 2010180309 ./dev-lua/luaevent/luaevent-0.4.6.ebuild
 2011140309 ./dev-lua/luaevent/luaevent-0.4.6-r100.ebuild
@@ -8496,6 +8506,7 @@
 2011240109 ./dev-lua/luafilesystem/luafilesystem-1.8.0-r100.ebuild
 2011241109 ./dev-lua/luafilesystem/luafilesystem-1.8.0-r1.ebuild
 1902152109 ./dev-lua/luajson/luajson-1.3.3.ebuild
+2011290239 ./dev-lua/luajson/luajson-1.3.4.ebuild
 1805181538 ./dev-lua/lualdap/lualdap-1.2.0.ebuild
 1702282250 ./dev-lua/luaossl/luaossl-20150727.ebuild
 1809281339 ./dev-lua/luaossl/luaossl-20180708.ebuild
@@ -8505,33 +8516,42 @@
 2009131009 ./dev-lua/luarocks/luarocks-3.3.1.ebuild
 2010120239 ./dev-lua/luasec/luasec-9999.ebuild
 2010180309 ./dev-lua/luasec/luasec-0.9.ebuild
-2011222309 ./dev-lua/luasec/luasec-0.9-r100.ebuild
+2011282109 ./dev-lua/luasec/luasec-0.9-r101.ebuild
 2008120909 ./dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild
 2011222109 ./dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r100.ebuild
 2011222109 ./dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild
 1704271330 ./dev-lua/luassert/luassert-1.7.9.ebuild
 1912110241 ./dev-lua/luassert/luassert-1.7.10.ebuild
 2011270209 ./dev-lua/luassert/luassert-1.8.0.ebuild
+2011282109 ./dev-lua/luassert/luassert-1.8.0-r101.ebuild
 2002230040 ./dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
 2011270209 ./dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
+2011282109 ./dev-lua/luasystem/luasystem-0.2.1_p0-r101.ebuild
 2004032241 ./dev-lua/lutok/lutok-0.4-r1.ebuild
 2005201909 ./dev-lua/lutok/lutok-0.4-r2.ebuild
 2011042009 ./dev-lua/lutok/lutok-0.4-r10.ebuild
 1912312209 ./dev-lua/luv/luv-1.32.0.0.ebuild
 2011161809 ./dev-lua/luv/luv-1.32.0.0-r101.ebuild
 2011261139 ./dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild
+2011282109 ./dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild
 1702282250 ./dev-lua/messagepack/messagepack-0.3.2.ebuild
 2010132009 ./dev-lua/messagepack/messagepack-0.3.2-r100.ebuild
 2008080909 ./dev-lua/mpack/mpack-1.0.4.ebuild
+2011290139 ./dev-lua/mpack/mpack-1.0.4-r100.ebuild
 1905250209 ./dev-lua/penlight/penlight-1.3.2.ebuild
 2003160339 ./dev-lua/penlight/penlight-1.5.4.ebuild
 2011270209 ./dev-lua/penlight/penlight-1.7.0.ebuild
+2011282109 ./dev-lua/penlight/penlight-1.9.2-r101.ebuild
+2011282109 ./dev-lua/penlight/penlight-1.9.2.ebuild
 1704271330 ./dev-lua/say/say-1.3_p1.ebuild
 2011261139 ./dev-lua/say/say-1.3_p1-r1.ebuild
+2011282109 ./dev-lua/say/say-1.3_p1-r101.ebuild
 2002112051 ./dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild
 2010132009 ./dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
-2009050239 ./dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
-2009050239 ./dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
+2011290439 ./dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
+2011290439 ./dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
+2011290309 ./dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
+2011290309 ./dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
 2011162039 ./dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
 2011241109 ./dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild
 1912110241 ./dev-ml/alcotest/alcotest-0.8.2.ebuild
@@ -8561,13 +8581,10 @@
 1808261309 ./dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild
 2010141439 ./dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
 1702282250 ./dev-ml/calendar/calendar-2.04.ebuild
-1708021422 ./dev-ml/camlbz2/camlbz2-0.6.0.ebuild
 2010280709 ./dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild
 2011180439 ./dev-ml/camldbm/camldbm-1.0.ebuild
 2011180439 ./dev-ml/camldbm/camldbm-1.2.ebuild
 1702282250 ./dev-ml/camlidl/camlidl-1.05-r1.ebuild
-2010141439 ./dev-ml/camlp4/camlp4-4.04_p1.ebuild
-2010141439 ./dev-ml/camlp4/camlp4-4.05_p1.ebuild
 2010141439 ./dev-ml/camlp4/camlp4-4.10_p1.ebuild
 2010141439 ./dev-ml/camlp4/camlp4-4.11_p1.ebuild
 2010252339 ./dev-ml/camlp4/camlp4-4.08_p1.ebuild
@@ -8580,9 +8597,6 @@
 2011011539 ./dev-ml/camlzip/camlzip-1.10.ebuild
 2009202339 ./dev-ml/camomile/camomile-0.8.5-r2.ebuild
 2010280709 ./dev-ml/camomile/camomile-1.0.2.ebuild
-2006041239 ./dev-ml/cmdliner/cmdliner-1.0.0.ebuild
-2006041239 ./dev-ml/cmdliner/cmdliner-1.0.1.ebuild
-2006041239 ./dev-ml/cmdliner/cmdliner-1.0.2.ebuild
 2010280709 ./dev-ml/cmdliner/cmdliner-1.0.4.ebuild
 1802141738 ./dev-ml/configurator/configurator-0.9.1.ebuild
 1708151249 ./dev-ml/core/core-0.9.1-r1.ebuild
@@ -8599,11 +8613,9 @@
 1702282250 ./dev-ml/csv/csv-1.5.ebuild
 1702282250 ./dev-ml/csv/csv-1.6.ebuild
 1706201511 ./dev-ml/csv/csv-1.7.ebuild
-2010171509 ./dev-ml/cudf/cudf-0.8-r1.ebuild
 2010280709 ./dev-ml/cudf/cudf-0.9.ebuild
 1702282250 ./dev-ml/deriving/deriving-0.7.1.ebuild
 1710061621 ./dev-ml/dns/dns-1.0.0.ebuild
-1912111539 ./dev-ml/dose3/dose3-5.0.1.ebuild
 2010280709 ./dev-ml/dose3/dose3-5.0.1-r1.ebuild
 2003312109 ./dev-ml/dune/dune-2.1.0.ebuild
 2010280709 ./dev-ml/dune/dune-2.7.1.ebuild
@@ -8618,9 +8630,6 @@
 2010031709 ./dev-ml/facile/facile-1.1.3.ebuild
 1704021137 ./dev-ml/fieldslib/fieldslib-0.9.0.ebuild
 2010280709 ./dev-ml/fieldslib/fieldslib-0.14.0.ebuild
-2010031709 ./dev-ml/findlib/findlib-1.7.1.ebuild
-2010031709 ./dev-ml/findlib/findlib-1.7.2.ebuild
-2010031709 ./dev-ml/findlib/findlib-1.7.3.ebuild
 2010031709 ./dev-ml/findlib/findlib-1.8.1.ebuild
 2010131609 ./dev-ml/findlib/findlib-1.8.1-r1.ebuild
 2006041239 ./dev-ml/fmt/fmt-0.8.4.ebuild
@@ -8649,11 +8658,10 @@
 2010031709 ./dev-ml/labltk/labltk-8.06.7.ebuild
 2010161339 ./dev-ml/labltk/labltk-8.06.9.ebuild
 2002101639 ./dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
-2003250109 ./dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.ebuild
 2007212239 ./dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild
-2010150039 ./dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
 2010150039 ./dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild
-2011171239 ./dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
+2011291209 ./dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
+2011291209 ./dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
 2006041239 ./dev-ml/logs/logs-0.6.2.ebuild
 1910111840 ./dev-ml/lwt/lwt-3.0.0.ebuild
 1910111840 ./dev-ml/lwt/lwt-3.1.0.ebuild
@@ -8663,8 +8671,6 @@
 1910111840 ./dev-ml/lwt_ssl/lwt_ssl-1.1.1.ebuild
 1702282250 ./dev-ml/macaque/macaque-0.7.4.ebuild
 1912110241 ./dev-ml/markup/markup-0.7.5.ebuild
-1707240834 ./dev-ml/menhir/menhir-20170712.ebuild
-1812151239 ./dev-ml/menhir/menhir-20171013.ebuild
 1910212139 ./dev-ml/menhir/menhir-20181006.ebuild
 1912031309 ./dev-ml/menhir/menhir-20190924.ebuild
 1702282250 ./dev-ml/merlin-extend/merlin-extend-0.3.ebuild
@@ -8897,15 +8903,15 @@
 2009110939 ./dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300-r1.ebuild
 2008242239 ./dev-perl/Algorithm-Munkres/Algorithm-Munkres-0.80.0-r2.ebuild
 2010220839 ./dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.140.0.ebuild
-2010220839 ./dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
+2011281239 ./dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
 2008071709 ./dev-perl/Alien-Build/Alien-Build-2.280.0.ebuild
 2008311739 ./dev-perl/Alien-Build/Alien-Build-2.230.0.ebuild
 2010220839 ./dev-perl/Alien-Build/Alien-Build-2.290.0.ebuild
 2010220839 ./dev-perl/Alien-Build/Alien-Build-2.320.0.ebuild
-2010220839 ./dev-perl/Alien-Build/Alien-Build-2.330.0.ebuild
+2011281239 ./dev-perl/Alien-Build/Alien-Build-2.330.0.ebuild
 1711281740 ./dev-perl/Alien-Gnuplot/Alien-Gnuplot-1.33.0.ebuild
 2007030339 ./dev-perl/Alien-LibGumbo/Alien-LibGumbo-0.50.0-r2.ebuild
-2008311739 ./dev-perl/Alien-Libxml2/Alien-Libxml2-0.160.0.ebuild
+2011281239 ./dev-perl/Alien-Libxml2/Alien-Libxml2-0.160.0.ebuild
 2008242239 ./dev-perl/Alien-SDL/Alien-SDL-1.446.0-r1.ebuild
 1912110241 ./dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.690.0-r1.ebuild
 2010170109 ./dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
@@ -8936,10 +8942,10 @@
 2008311739 ./dev-perl/AppConfig/AppConfig-1.710.0-r1.ebuild
 2008242239 ./dev-perl/Archive-Any/Archive-Any-0.94.600.ebuild
 2009030739 ./dev-perl/Archive-Extract/Archive-Extract-0.800.0.ebuild
-2010220839 ./dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild
+2011281239 ./dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild
 2009161209 ./dev-perl/Archive-Tar-Wrapper/Archive-Tar-Wrapper-0.380.0.ebuild
 2004151039 ./dev-perl/Archive-Zip/Archive-Zip-1.640.0.ebuild
-2008311739 ./dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
+2011282239 ./dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
 2008311739 ./dev-perl/Array-Compare/Array-Compare-3.0.3.ebuild
 2008311739 ./dev-perl/Array-RefElem/Array-RefElem-1.0.0-r3.ebuild
 2008242239 ./dev-perl/Array-Window/Array-Window-1.20.0-r2.ebuild
@@ -9104,7 +9110,7 @@
 2008311739 ./dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild
 2008311739 ./dev-perl/Clipboard/Clipboard-0.260.0.ebuild
 2004032241 ./dev-perl/Clone/Clone-0.390.0.ebuild
-2010220839 ./dev-perl/Clone/Clone-0.450.0.ebuild
+2011281309 ./dev-perl/Clone/Clone-0.450.0.ebuild
 1912110241 ./dev-perl/Color-Calc/Color-Calc-1.74.0.ebuild
 1912110241 ./dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild
 2006261739 ./dev-perl/Color-Library/Color-Library-0.21.0-r2.ebuild
@@ -9194,9 +9200,9 @@
 2007020109 ./dev-perl/Crypt-OpenSSL-EC/Crypt-OpenSSL-EC-1.320.0.ebuild
 2007020109 ./dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r3.ebuild
 2004032241 ./dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild
-2010220839 ./dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
+2011281309 ./dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
 2004032241 ./dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
-2010220839 ./dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
+2011281309 ./dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
 2004032241 ./dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.400.0.ebuild
 2007021039 ./dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.400.0-r1.ebuild
 2002112051 ./dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r1.ebuild
@@ -9245,7 +9251,7 @@
 2011231109 ./dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
 2004032241 ./dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild
 2004032241 ./dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
-2007090609 ./dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
+2011281309 ./dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
 1801051639 ./dev-perl/DBI-Shell/DBI-Shell-11.950.0-r2.ebuild
 2008210709 ./dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild
 2009061109 ./dev-perl/DBI/DBI-1.643.0.ebuild
@@ -9404,7 +9410,7 @@
 2009071509 ./dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0.ebuild
 1912110241 ./dev-perl/Devel-GlobalPhase/Devel-GlobalPhase-0.3.3.ebuild
 2004151039 ./dev-perl/Devel-Hide/Devel-Hide-0.0.900.ebuild
-2008171209 ./dev-perl/Devel-Hide/Devel-Hide-0.1.300.ebuild
+2011281239 ./dev-perl/Devel-Hide/Devel-Hide-0.1.300.ebuild
 2004032241 ./dev-perl/Devel-Leak/Devel-Leak-0.30.0.ebuild
 2007300909 ./dev-perl/Devel-Leak/Devel-Leak-0.30.0-r1.ebuild
 2004141739 ./dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
@@ -9420,7 +9426,7 @@
 2007301209 ./dev-perl/Devel-Refactor/Devel-Refactor-0.50.0-r2.ebuild
 1912110241 ./dev-perl/Devel-SimpleTrace/Devel-SimpleTrace-0.80.0.ebuild
 2006212009 ./dev-perl/Devel-Size/Devel-Size-0.820.0.ebuild
-2007301209 ./dev-perl/Devel-Size/Devel-Size-0.830.0.ebuild
+2011281209 ./dev-perl/Devel-Size/Devel-Size-0.830.0.ebuild
 1909100409 ./dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild
 2004032241 ./dev-perl/Devel-StackTrace-AsHTML/Devel-StackTrace-AsHTML-0.150.0.ebuild
 2004141739 ./dev-perl/Devel-StackTrace/Devel-StackTrace-2.20.0.ebuild
@@ -9570,7 +9576,7 @@
 2004290039 ./dev-perl/FCGI/FCGI-0.780.0.ebuild
 2008211009 ./dev-perl/FCGI/FCGI-0.790.0.ebuild
 2008171209 ./dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
-2008211009 ./dev-perl/FFI-CheckLib/FFI-CheckLib-0.270.0.ebuild
+2011281239 ./dev-perl/FFI-CheckLib/FFI-CheckLib-0.270.0.ebuild
 1702282250 ./dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild
 2008211039 ./dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.10.0-r1.ebuild
 1912110241 ./dev-perl/Fatal-Exception/Fatal-Exception-0.50.0-r2.ebuild
@@ -9582,7 +9588,7 @@
 2008211909 ./dev-perl/File-BaseDir/File-BaseDir-0.80.0.ebuild
 2010170109 ./dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
 2004141909 ./dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild
-2010220839 ./dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
+2011281309 ./dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
 2004211009 ./dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
 1912110241 ./dev-perl/File-Find-Rule-Perl/File-Find-Rule-Perl-1.150.0.ebuild
 2004151039 ./dev-perl/File-Find-Rule/File-Find-Rule-0.340.0.ebuild
@@ -9649,7 +9655,7 @@
 2009081039 ./dev-perl/File-Type/File-Type-0.220.0-r2.ebuild
 2004151039 ./dev-perl/File-Which/File-Which-1.220.0.ebuild
 2009081109 ./dev-perl/File-Which/File-Which-1.230.0.ebuild
-2004151039 ./dev-perl/File-chdir/File-chdir-0.101.100.ebuild
+2011281239 ./dev-perl/File-chdir/File-chdir-0.101.100.ebuild
 2004032241 ./dev-perl/File-chmod/File-chmod-0.420.0.ebuild
 2009081139 ./dev-perl/File-chmod/File-chmod-0.420.0-r1.ebuild
 2004032241 ./dev-perl/File-pushd/File-pushd-1.14.0.ebuild
@@ -9796,7 +9802,7 @@
 2004032241 ./dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0.ebuild
 1806102209 ./dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r2.ebuild
 2004032241 ./dev-perl/Heap/Heap-0.800.0-r2.ebuild
-2009031339 ./dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild
+2011281309 ./dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild
 1806102239 ./dev-perl/IMAP-Admin/IMAP-Admin-1.6.8.ebuild
 1912110241 ./dev-perl/IMAP-BodyStructure/IMAP-BodyStructure-1.30.0.ebuild
 1806102239 ./dev-perl/IO-AIO/IO-AIO-4.340.0.ebuild
@@ -9842,7 +9848,7 @@
 1912110241 ./dev-perl/Image-Sane/Image-Sane-0.140.0.ebuild
 1912110241 ./dev-perl/Image-Scale/Image-Scale-0.130.0.ebuild
 1912110241 ./dev-perl/Image-Size/Image-Size-3.300.0.ebuild
-2009031339 ./dev-perl/Import-Into/Import-Into-1.2.5.ebuild
+2011281309 ./dev-perl/Import-Into/Import-Into-1.2.5.ebuild
 2007060609 ./dev-perl/Importer/Importer-0.24.0.ebuild
 2010170109 ./dev-perl/Inline-C/Inline-C-0.780.0.ebuild
 2002112051 ./dev-perl/Inline-Files/Inline-Files-0.690.0.ebuild
@@ -10295,8 +10301,8 @@
 2009271139 ./dev-perl/Pod-Markdown/Pod-Markdown-3.5.0.ebuild
 1912110241 ./dev-perl/Pod-POM-View-Restructured/Pod-POM-View-Restructured-1.0.1.ebuild
 1912110241 ./dev-perl/Pod-POM/Pod-POM-2.10.0.ebuild
-2005031809 ./dev-perl/Pod-Readme/Pod-Readme-1.2.3.ebuild
 2007210009 ./dev-perl/Pod-Readme/Pod-Readme-1.1.2.ebuild
+2011281309 ./dev-perl/Pod-Readme/Pod-Readme-1.2.3.ebuild
 2009271139 ./dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0.ebuild
 2002112051 ./dev-perl/Pod-Spell/Pod-Spell-1.200.0.ebuild
 1912110241 ./dev-perl/Pod-Strip/Pod-Strip-1.20.0-r1.ebuild
@@ -10375,9 +10381,9 @@
 2002112051 ./dev-perl/Set-IntSpan/Set-IntSpan-1.190.0-r1.ebuild
 1912110241 ./dev-perl/Set-Object/Set-Object-1.380.0.ebuild
 2004032241 ./dev-perl/Set-Scalar/Set-Scalar-1.290.0.ebuild
-2010220839 ./dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.330.0.ebuild
+2011281239 ./dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.330.0.ebuild
 2004032241 ./dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild
-2010220839 ./dev-perl/Shell-Guess/Shell-Guess-0.90.0.ebuild
+2011281239 ./dev-perl/Shell-Guess/Shell-Guess-0.90.0.ebuild
 1912110241 ./dev-perl/Shell/Shell-0.730.0.ebuild
 1802260108 ./dev-perl/ShipIt/ShipIt-0.600.0-r1.ebuild
 1912110241 ./dev-perl/Signal-Mask/Signal-Mask-0.8.0.ebuild
@@ -10392,7 +10398,7 @@
 1812231709 ./dev-perl/Sort-Key/Sort-Key-1.330.0-r1.ebuild
 1702282250 ./dev-perl/Sort-Naturally/Sort-Naturally-1.30.0-r1.ebuild
 2004032241 ./dev-perl/Sort-Tree/Sort-Tree-1.90.0-r1.ebuild
-2009030739 ./dev-perl/Sort-Versions/Sort-Versions-1.620.0.ebuild
+2011281239 ./dev-perl/Sort-Versions/Sort-Versions-1.620.0.ebuild
 2007210009 ./dev-perl/Specio/Specio-0.420.0.ebuild
 1702282250 ./dev-perl/Speech-Recognizer-SPX/Speech-Recognizer-SPX-0.80.100-r1.ebuild
 1912110241 ./dev-perl/Sphinx-Config/Sphinx-Config-0.100.0.ebuild
@@ -10513,7 +10519,7 @@
 2004032241 ./dev-perl/Test-Fatal/Test-Fatal-0.14.0.ebuild
 1912110241 ./dev-perl/Test-File-Contents/Test-File-Contents-0.230.0.ebuild
 2007060609 ./dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
-2010220839 ./dev-perl/Test-File/Test-File-1.443.0.ebuild
+2011281309 ./dev-perl/Test-File/Test-File-1.443.0.ebuild
 1702282250 ./dev-perl/Test-Files/Test-Files-0.140.0.ebuild
 1912110241 ./dev-perl/Test-Inline/Test-Inline-2.213.0-r2.ebuild
 2004032241 ./dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild
@@ -10567,7 +10573,7 @@
 2004032241 ./dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild
 2007060609 ./dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
 2004032241 ./dev-perl/Test-YAML/Test-YAML-1.60.0.ebuild
-2010220839 ./dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
+2011281309 ./dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
 2007060609 ./dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.60.0.ebuild
 2007060609 ./dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
 1912110241 ./dev-perl/Text-Aligner/Text-Aligner-0.130.0.ebuild
@@ -10628,7 +10634,7 @@
 2007210009 ./dev-perl/Tie-Sub/Tie-Sub-1.1.0-r1.ebuild
 1912110241 ./dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r1.ebuild
 1912110241 ./dev-perl/Time-Duration-Parse/Time-Duration-Parse-0.130.0.ebuild
-2005140039 ./dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
+2011281239 ./dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
 1912110241 ./dev-perl/Time-Format/Time-Format-1.120.0-r1.ebuild
 1912110241 ./dev-perl/Time-Moment/Time-Moment-0.430.0.ebuild
 1912110241 ./dev-perl/Time-Monotonic/Time-Monotonic-0.9.8.ebuild
@@ -10754,8 +10760,8 @@
 2004032241 ./dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild
 2004032241 ./dev-perl/XML-LibXML-Iterator/XML-LibXML-Iterator-1.40.0-r1.ebuild
 1912110241 ./dev-perl/XML-LibXML-Simple/XML-LibXML-Simple-0.990.0.ebuild
-2007060609 ./dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
 2007212309 ./dev-perl/XML-LibXML/XML-LibXML-2.13.200.ebuild
+2011281239 ./dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
 2007212309 ./dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild
 1702282250 ./dev-perl/XML-Mini/XML-Mini-1.380.0-r1.ebuild
 2004032241 ./dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
@@ -10902,12 +10908,12 @@
 2005031809 ./dev-perl/Module-CPANfile/Module-CPANfile-1.100.400.ebuild
 2005031809 ./dev-perl/MooseX-Types-URI/MooseX-Types-URI-0.80.0.ebuild
 2005032039 ./dev-perl/Perl-Strip/Perl-Strip-1.100.0.ebuild
-2005031809 ./dev-perl/Pod-Markdown-Github/Pod-Markdown-Github-0.40.0.ebuild
-2009031339 ./dev-perl/Sub-Delete/Sub-Delete-1.0.20.ebuild
-2009031339 ./dev-perl/Test-Kit/Test-Kit-2.150.0.ebuild
+2011281309 ./dev-perl/Pod-Markdown-Github/Pod-Markdown-Github-0.40.0.ebuild
+2011281309 ./dev-perl/Sub-Delete/Sub-Delete-1.0.20.ebuild
+2011281309 ./dev-perl/Test-Kit/Test-Kit-2.150.0.ebuild
 2005031809 ./dev-perl/URI-FromHash/URI-FromHash-0.50.0.ebuild
-2010220839 ./dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
-2010220839 ./dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
+2011281309 ./dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
+2011281309 ./dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
 2007091409 ./dev-perl/SQL-Abstract-Classic/SQL-Abstract-Classic-1.910.0.ebuild
 2008010139 ./dev-perl/Types-Path-Tiny/Types-Path-Tiny-0.6.0.ebuild
 2008130709 ./dev-perl/Pod-Parser/Pod-Parser-1.630.0-r1.ebuild
@@ -11352,15 +11358,9 @@
 2009230239 ./dev-python/PyECLib/PyECLib-1.6.0.ebuild
 2009241009 ./dev-python/PyGithub/PyGithub-1.53.ebuild
 2004150609 ./dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
-2008020239 ./dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
-2008221139 ./dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
 2011120339 ./dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild
-2008020239 ./dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
-2008020239 ./dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
-2011261409 ./dev-python/PyQt5/PyQt5-5.15.1.ebuild
-2008020239 ./dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
-2008020239 ./dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
-2011261409 ./dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild
+2011281239 ./dev-python/PyQt5/PyQt5-5.15.1.ebuild
+2011281239 ./dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild
 2008222139 ./dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
 2007121009 ./dev-python/PySDL2/PySDL2-0.9.7.ebuild
 1912281939 ./dev-python/PySensors/PySensors-0.0.4.ebuild
@@ -11381,7 +11381,7 @@
 2011270309 ./dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
 2011270309 ./dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
 2011270309 ./dev-python/aiohttp/aiohttp-3.7.3.ebuild
-2011271939 ./dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
+2011291139 ./dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
 2009251039 ./dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild
 2010160510 ./dev-python/aiosmtpd/aiosmtpd-1.2.ebuild
 2011101209 ./dev-python/aiosmtpd/aiosmtpd-1.2.2.ebuild
@@ -11411,19 +11411,19 @@
 2005071739 ./dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
 2010132339 ./dev-python/astor/astor-0.8.1.ebuild
 2010180309 ./dev-python/astroid/astroid-2.4.2-r1.ebuild
-2011262239 ./dev-python/async_generator/async_generator-1.10.ebuild
-2011262239 ./dev-python/async_timeout/async_timeout-3.0.1.ebuild
+2011281709 ./dev-python/async_generator/async_generator-1.10.ebuild
+2011281909 ./dev-python/async_timeout/async_timeout-3.0.1.ebuild
 2009201909 ./dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
 2011101209 ./dev-python/atpublic/atpublic-1.0.ebuild
 2009201909 ./dev-python/attrs/attrs-20.1.0-r1.ebuild
 2009201909 ./dev-python/attrs/attrs-20.2.0-r1.ebuild
-2011051609 ./dev-python/attrs/attrs-20.3.0.ebuild
+2011281139 ./dev-python/attrs/attrs-20.3.0.ebuild
 2004261339 ./dev-python/audioread/audioread-2.1.8-r2.ebuild
 2011101209 ./dev-python/authheaders/authheaders-0.13.0.ebuild
 2008050339 ./dev-python/authres/authres-1.2.0.ebuild
 2007202039 ./dev-python/autobahn/autobahn-20.4.3.ebuild
 2007202039 ./dev-python/autobahn/autobahn-20.7.1.ebuild
-2009041409 ./dev-python/automat/automat-20.2.0.ebuild
+2011281509 ./dev-python/automat/automat-20.2.0.ebuild
 2002041639 ./dev-python/automaton/automaton-1.12.1.ebuild
 2011261139 ./dev-python/automaton/automaton-2.2.0.ebuild
 2010182239 ./dev-python/autopep8/autopep8-1.5.4.ebuild
@@ -11450,18 +11450,18 @@
 2008221239 ./dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
 2009190209 ./dev-python/bcrypt/bcrypt-3.2.0.ebuild
 2010160510 ./dev-python/beagle/beagle-0.3.0.ebuild
-2011021439 ./dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
+2011281909 ./dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
 2004232109 ./dev-python/bert/bert-2.2.0.ebuild
-2010162139 ./dev-python/betamax/betamax-0.8.1.ebuild
+2011281739 ./dev-python/betamax/betamax-0.8.1.ebuild
 2011170339 ./dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
 2008150239 ./dev-python/billiard/billiard-3.6.0.0.ebuild
 2011021309 ./dev-python/binaryornot/binaryornot-0.4.4-r1.ebuild
 2011141239 ./dev-python/bitarray/bitarray-0.8.3.ebuild
 2011141239 ./dev-python/bitarray/bitarray-1.6.1.ebuild
 2009181139 ./dev-python/bitstring/bitstring-3.1.7.ebuild
-2010082209 ./dev-python/bleach/bleach-3.2.1.ebuild
+2011281739 ./dev-python/bleach/bleach-3.2.1.ebuild
 2006021508 ./dev-python/blessings/blessings-1.7-r1.ebuild
-2009201339 ./dev-python/blinker/blinker-1.4-r2.ebuild
+2011281139 ./dev-python/blinker/blinker-1.4-r2.ebuild
 2011262239 ./dev-python/blockdiag/blockdiag-2.0.1.ebuild
 2011031239 ./dev-python/blosc/blosc-1.9.2.ebuild
 2011021609 ./dev-python/bluelet/bluelet-0.2.0.ebuild
@@ -11494,7 +11494,7 @@
 2011151409 ./dev-python/bpython/bpython-0.20.ebuild
 2009300039 ./dev-python/breathe/breathe-4.14.1.ebuild
 2010311309 ./dev-python/breathe/breathe-4.22.1.ebuild
-2009201409 ./dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
+2011281139 ./dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
 2006272339 ./dev-python/brython/brython-3.7.3.ebuild
 2007010939 ./dev-python/brython/brython-3.7.4.ebuild
 2008150239 ./dev-python/bsddb3/bsddb3-6.2.7.ebuild
@@ -11508,21 +11508,21 @@
 2005091339 ./dev-python/carbon/carbon-1.1.5.ebuild
 2011090239 ./dev-python/case/case-1.5.3.ebuild
 2001131309 ./dev-python/castellan/castellan-1.2.2.ebuild
-2010180709 ./dev-python/castellan/castellan-3.6.0.ebuild
+2011291139 ./dev-python/castellan/castellan-3.6.0.ebuild
 2010131439 ./dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
 2010131439 ./dev-python/catkin_pkg/catkin_pkg-9999.ebuild
 2007201509 ./dev-python/cbor/cbor-1.0.0-r1.ebuild
 2010162139 ./dev-python/celery/celery-4.3.0.ebuild
 2008031009 ./dev-python/certifi/certifi-10001.ebuild
 2009281909 ./dev-python/certifi/certifi-10001-r1.ebuild
-2009201739 ./dev-python/cffi/cffi-1.14.0-r3.ebuild
+2011281039 ./dev-python/cffi/cffi-1.14.0-r3.ebuild
 2011172109 ./dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
 2011251209 ./dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
 2011261139 ./dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
 2003271809 ./dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
 2006040939 ./dev-python/chai/chai-1.1.2.ebuild
 2008220909 ./dev-python/chameleon/chameleon-3.8.1.ebuild
-2009041409 ./dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+2011281739 ./dev-python/characteristic/characteristic-14.3.0-r3.ebuild
 2009201409 ./dev-python/chardet/chardet-3.0.4-r1.ebuild
 2008010139 ./dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
 2004032241 ./dev-python/cheetah/cheetah-2.4.4-r1.ebuild
@@ -11536,11 +11536,10 @@
 2004061139 ./dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
 2009050339 ./dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
 2001051415 ./dev-python/clang-python/clang-python-9.0.1.ebuild
-2006232139 ./dev-python/clang-python/clang-python-11.0.0.9999.ebuild
-2007041609 ./dev-python/clang-python/clang-python-10.0.0.ebuild
-2007152209 ./dev-python/clang-python/clang-python-12.0.0.9999.ebuild
 2009201839 ./dev-python/clang-python/clang-python-10.0.1.ebuild
 2011170009 ./dev-python/clang-python/clang-python-11.0.0.ebuild
+2011291209 ./dev-python/clang-python/clang-python-11.0.0.9999.ebuild
+2011291209 ./dev-python/clang-python/clang-python-12.0.0.9999.ebuild
 2007300909 ./dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
 2011170339 ./dev-python/cli_helpers/cli_helpers-9999.ebuild
 2004261809 ./dev-python/click-log/click-log-0.3.2.ebuild
@@ -11548,7 +11547,7 @@
 2006121009 ./dev-python/click-plugins/click-plugins-1.1.1.ebuild
 2004261809 ./dev-python/click-threading/click-threading-0.4.4.ebuild
 2009201339 ./dev-python/click/click-6.7-r2.ebuild
-2009201339 ./dev-python/click/click-7.1.2-r1.ebuild
+2011281139 ./dev-python/click/click-7.1.2-r1.ebuild
 2009301939 ./dev-python/cliff/cliff-3.4.0.ebuild
 2011120009 ./dev-python/cliff/cliff-3.5.0.ebuild
 2011040839 ./dev-python/clint/clint-0.5.1-r3.ebuild
@@ -11572,22 +11571,22 @@
 2001051415 ./dev-python/confuse/confuse-1.0.0.ebuild
 2011251209 ./dev-python/confuse/confuse-1.4.0.ebuild
 2008250139 ./dev-python/consonance/consonance-0.1.3-r1.ebuild
-2009041409 ./dev-python/constantly/constantly-15.1.0-r1.ebuild
+2011281509 ./dev-python/constantly/constantly-15.1.0-r1.ebuild
 2011142339 ./dev-python/construct/construct-2.10.56.ebuild
-2009201909 ./dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
+2011281709 ./dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
 2009260809 ./dev-python/cookies/cookies-2.2.1-r1.ebuild
 2002042309 ./dev-python/coreapi/coreapi-2.3.3-r1.ebuild
 2002042309 ./dev-python/coreschema/coreschema-0.0.4.ebuild
 2002042309 ./dev-python/couchdb-python/couchdb-python-1.1.ebuild
 2011181209 ./dev-python/cov-core/cov-core-1.15.0-r2.ebuild
-2011172209 ./dev-python/coverage/coverage-5.3.ebuild
 2011181209 ./dev-python/coverage/coverage-4.5.4.ebuild
+2011281709 ./dev-python/coverage/coverage-5.3.ebuild
 2010162139 ./dev-python/crcmod/crcmod-1.7-r4.ebuild
 2010070339 ./dev-python/croniter/croniter-0.3.30.ebuild
 2010281209 ./dev-python/cryptography/cryptography-3.2.1.ebuild
 2010300139 ./dev-python/cryptography/cryptography-3.2.ebuild
 2007172339 ./dev-python/css-parser/css-parser-1.0.4-r1.ebuild
-2009261939 ./dev-python/cssselect/cssselect-1.1.0-r1.ebuild
+2011281709 ./dev-python/cssselect/cssselect-1.1.0-r1.ebuild
 2009261409 ./dev-python/cssselect2/cssselect2-0.3.0.ebuild
 2010300309 ./dev-python/cssselect2/cssselect2-0.4.1.ebuild
 2008231509 ./dev-python/cssutils/cssutils-1.0.2-r2.ebuild
@@ -11690,14 +11689,14 @@
 2006290009 ./dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
 2008172209 ./dev-python/emcee/emcee-3.0.2.ebuild
 2011151509 ./dev-python/empy/empy-3.3.4.ebuild
-2010220539 ./dev-python/entrypoints/entrypoints-0.3-r2.ebuild
+2011281739 ./dev-python/entrypoints/entrypoints-0.3-r2.ebuild
 2008022209 ./dev-python/enzyme/enzyme-9999.ebuild
 2010272309 ./dev-python/enzyme/enzyme-0.4.1-r2.ebuild
 2010062009 ./dev-python/eradicate/eradicate-2.0.0.ebuild
 2011171809 ./dev-python/errorhandler/errorhandler-2.0.1.ebuild
 2008251539 ./dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
 2009231339 ./dev-python/eventlet/eventlet-0.26.1.ebuild
-2009201109 ./dev-python/execnet/execnet-1.7.1-r1.ebuild
+2011281209 ./dev-python/execnet/execnet-1.7.1-r1.ebuild
 2011040839 ./dev-python/expects/expects-0.9.0.ebuild
 2009201909 ./dev-python/extras/extras-1.0.0-r1.ebuild
 2008091639 ./dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
@@ -11709,15 +11708,15 @@
 2011261009 ./dev-python/feedparser/feedparser-6.0.2.ebuild
 2003190539 ./dev-python/fido2/fido2-0.7.3.ebuild
 2007082339 ./dev-python/fido2/fido2-0.8.1.ebuild
-2010162139 ./dev-python/fields/fields-5.0.0-r2.ebuild
-2009201739 ./dev-python/filelock/filelock-3.0.12-r1.ebuild
+2011281839 ./dev-python/fields/fields-5.0.0-r2.ebuild
+2011281209 ./dev-python/filelock/filelock-3.0.12-r1.ebuild
 2004221139 ./dev-python/fitsio/fitsio-0.9.11.ebuild
 2009201909 ./dev-python/fixtures/fixtures-3.0.0-r1.ebuild
 2011171809 ./dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
 2004040839 ./dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
 2007132009 ./dev-python/flake8/flake8-3.8.1.ebuild
-2011090239 ./dev-python/flake8/flake8-3.8.3-r1.ebuild
-2010162139 ./dev-python/flaky/flaky-3.7.0-r1.ebuild
+2011281909 ./dev-python/flake8/flake8-3.8.3-r1.ebuild
+2011281839 ./dev-python/flaky/flaky-3.7.0-r1.ebuild
 2009231439 ./dev-python/flask-api/flask-api-2.0.ebuild
 2010010439 ./dev-python/flask-babel/flask-babel-2.0.0.ebuild
 2007090839 ./dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
@@ -11740,8 +11739,8 @@
 2008020139 ./dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
 2008220909 ./dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.ebuild
 2007090839 ./dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
-2009201339 ./dev-python/flask/flask-1.1.2-r1.ebuild
 2009201339 ./dev-python/flask/flask-9999.ebuild
+2011281139 ./dev-python/flask/flask-1.1.2-r1.ebuild
 2006212009 ./dev-python/flexmock/flexmock-0.10.4.ebuild
 2011101239 ./dev-python/flufl-bounce/flufl-bounce-3.0.1.ebuild
 2011101309 ./dev-python/flufl-i18n/flufl-i18n-2.0.2.ebuild
@@ -11768,10 +11767,10 @@
 2009251439 ./dev-python/gast/gast-0.3.3-r1.ebuild
 2005181339 ./dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5-r1.ebuild
 2008221239 ./dev-python/genshi/genshi-0.7.3-r1.ebuild
-2009201909 ./dev-python/genty/genty-1.3.2-r1.ebuild
+2011281709 ./dev-python/genty/genty-1.3.2-r1.ebuild
 2008021139 ./dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
 2010160510 ./dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
-2011241109 ./dev-python/gevent/gevent-20.9.0.ebuild
+2011281739 ./dev-python/gevent/gevent-20.9.0.ebuild
 2009200039 ./dev-python/geventhttpclient/geventhttpclient-1.4.4-r1.ebuild
 2010160510 ./dev-python/git-review/git-review-1.28.0.ebuild
 2007081609 ./dev-python/gitdb/gitdb-4.0.5.ebuild
@@ -11779,7 +11778,7 @@
 2011172109 ./dev-python/github3/github3-1.3.0.ebuild
 2009302109 ./dev-python/glance_store/glance_store-1.0.1.ebuild
 2010180709 ./dev-python/glance_store/glance_store-2.3.0.ebuild
-2009201309 ./dev-python/gmpy/gmpy-2.0.8-r2.ebuild
+2011281509 ./dev-python/gmpy/gmpy-2.0.8-r2.ebuild
 2009202339 ./dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
 2005151009 ./dev-python/google-apitools/google-apitools-0.5.31.ebuild
 2009181139 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.0.4.ebuild
@@ -11792,7 +11791,7 @@
 2009280139 ./dev-python/graph-tool/graph-tool-9999.ebuild
 2011151509 ./dev-python/graphviz/graphviz-0.14.2.ebuild
 2011160109 ./dev-python/graphviz/graphviz-0.15.ebuild
-2011172209 ./dev-python/greenlet/greenlet-0.4.17.ebuild
+2011281709 ./dev-python/greenlet/greenlet-0.4.17.ebuild
 2011172109 ./dev-python/greenstalk/greenstalk-1.0.1.ebuild
 2009260209 ./dev-python/grpcio-testing/grpcio-testing-1.32.0.ebuild
 2009260209 ./dev-python/grpcio-tools/grpcio-tools-1.32.0.ebuild
@@ -11819,7 +11818,7 @@
 2004231209 ./dev-python/httmock/httmock-1.2.5.ebuild
 2007132139 ./dev-python/http-parser/http-parser-0.9.0.ebuild
 2009050239 ./dev-python/httpauth/httpauth-0.3.ebuild
-2009201339 ./dev-python/httpbin/httpbin-0.7.0-r1.ebuild
+2011281139 ./dev-python/httpbin/httpbin-0.7.0-r1.ebuild
 2009201309 ./dev-python/httplib2/httplib2-0.18.1-r1.ebuild
 2003271509 ./dev-python/httpretty/httpretty-0.9.6.ebuild
 2009010739 ./dev-python/httpretty/httpretty-1.0.2-r1.ebuild
@@ -11831,7 +11830,7 @@
 2010030009 ./dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
 2009041409 ./dev-python/hyperframe/hyperframe-5.2.0.ebuild
 2010030009 ./dev-python/hyperframe/hyperframe-6.0.0.ebuild
-2009090209 ./dev-python/hyperlink/hyperlink-20.0.1.ebuild
+2011281509 ./dev-python/hyperlink/hyperlink-20.0.1.ebuild
 2009122009 ./dev-python/hypothesis/hypothesis-5.24.4.ebuild
 2010302039 ./dev-python/hypothesis/hypothesis-5.41.0.ebuild
 2011031139 ./dev-python/hypothesis/hypothesis-5.41.1.ebuild
@@ -11839,7 +11838,8 @@
 2011232009 ./dev-python/hypothesis/hypothesis-5.35.4.ebuild
 2011242239 ./dev-python/hypothesis/hypothesis-5.36.2.ebuild
 2011271239 ./dev-python/hypothesis/hypothesis-5.37.5.ebuild
-2011271239 ./dev-python/hypothesis/hypothesis-5.41.3.ebuild
+2011281439 ./dev-python/hypothesis/hypothesis-5.41.3.ebuild
+2011282309 ./dev-python/hypothesis/hypothesis-5.41.4.ebuild
 2010182239 ./dev-python/icalendar/icalendar-4.0.7.ebuild
 2011270309 ./dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild
 2009201639 ./dev-python/idna/idna-2.10-r1.ebuild
@@ -11852,13 +11852,13 @@
 2009201909 ./dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild
 2010260109 ./dev-python/importlib_metadata/importlib_metadata-2.0.0.ebuild
 2011240309 ./dev-python/importlib_metadata/importlib_metadata-3.0.0.ebuild
-2011250139 ./dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
+2011281139 ./dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
 2009201909 ./dev-python/importlib_resources/importlib_resources-1.5.0-r2.ebuild
-2010290309 ./dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
-2010010209 ./dev-python/incremental/incremental-17.5.0.ebuild
+2011281139 ./dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
+2011281509 ./dev-python/incremental/incremental-17.5.0.ebuild
 2011172109 ./dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild
 2009211840 ./dev-python/inflect/inflect-4.1.0.ebuild
-2011160309 ./dev-python/inflect/inflect-5.0.2.ebuild
+2011281139 ./dev-python/inflect/inflect-5.0.2.ebuild
 2008241639 ./dev-python/inflection/inflection-0.5.1.ebuild
 2003201209 ./dev-python/iniparse/iniparse-0.4-r2.ebuild
 2011090239 ./dev-python/iniparse/iniparse-0.5.ebuild
@@ -11885,13 +11885,13 @@
 2006182139 ./dev-python/isodate/isodate-0.6.0-r1.ebuild
 2004032241 ./dev-python/isort/isort-4.3.15.ebuild
 2009220939 ./dev-python/isort/isort-4.3.21_p2-r1.ebuild
-2010170109 ./dev-python/isort/isort-5.6.3.ebuild
-2009201339 ./dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
+2011281909 ./dev-python/isort/isort-5.6.3.ebuild
+2011281139 ./dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
 2002051809 ./dev-python/itypes/itypes-1.1.0.ebuild
-2009062039 ./dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+2011281739 ./dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
 2009211840 ./dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
-2009211840 ./dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
-2009211840 ./dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
+2011281839 ./dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+2011281139 ./dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
 2009211840 ./dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
 2010180309 ./dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild
 2011221939 ./dev-python/jaraco-packaging/jaraco-packaging-8.1.1.ebuild
@@ -11902,7 +11902,7 @@
 2009181139 ./dev-python/jedi/jedi-0.17.1-r1.ebuild
 2009062039 ./dev-python/jeepney/jeepney-0.4.3.ebuild
 2011121239 ./dev-python/jeepney/jeepney-0.5.0.ebuild
-2011201309 ./dev-python/jeepney/jeepney-0.6.0.ebuild
+2011282009 ./dev-python/jeepney/jeepney-0.6.0.ebuild
 2005220809 ./dev-python/jellyfish/jellyfish-0.8.2.ebuild
 2007250041 ./dev-python/jikanpy/jikanpy-4.2.1.ebuild
 2009201739 ./dev-python/jinja/jinja-2.11.2-r1.ebuild
@@ -11940,10 +11940,9 @@
 2009011239 ./dev-python/kazoo/kazoo-2.8.0.ebuild
 2010280609 ./dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
 2010010239 ./dev-python/keyring/keyring-21.4.0.ebuild
-2011080039 ./dev-python/keyring/keyring-21.5.0.ebuild
+2011281839 ./dev-python/keyring/keyring-21.5.0.ebuild
 2011160309 ./dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
-2001131309 ./dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
-2010180109 ./dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild
+2011291139 ./dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild
 2011021309 ./dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
 2011271909 ./dev-python/kiwisolver/kiwisolver-1.3.0.ebuild
 2005302109 ./dev-python/kombu/kombu-4.6.8.ebuild
@@ -11969,12 +11968,11 @@
 2011102139 ./dev-python/libvirt-python/libvirt-python-6.8.0.ebuild
 2011182209 ./dev-python/line_profiler/line_profiler-3.0.2.ebuild
 2009201909 ./dev-python/linecache2/linecache2-1.0.0-r1.ebuild
-2008021139 ./dev-python/lit/lit-10.0.0.ebuild
-2008021139 ./dev-python/lit/lit-11.0.0.9999.ebuild
-2008021139 ./dev-python/lit/lit-12.0.0.9999.ebuild
 2008021139 ./dev-python/lit/lit-9.0.1.ebuild
 2010110939 ./dev-python/lit/lit-10.0.1.ebuild
 2011172339 ./dev-python/lit/lit-11.0.0.ebuild
+2011291209 ./dev-python/lit/lit-11.0.0.9999.ebuild
+2011291209 ./dev-python/lit/lit-12.0.0.9999.ebuild
 2005091109 ./dev-python/livereload/livereload-2.6.1.ebuild
 2008292109 ./dev-python/llfuse/llfuse-1.3.6.ebuild
 2009190539 ./dev-python/llvmlite/llvmlite-0.34.0.ebuild
@@ -11986,12 +11984,12 @@
 2009220209 ./dev-python/loguru/loguru-0.5.3.ebuild
 2010160510 ./dev-python/logutils/logutils-0.3.5.ebuild
 2011271139 ./dev-python/lxml/lxml-4.6.1.ebuild
-2011272009 ./dev-python/lxml/lxml-4.6.2.ebuild
+2011291139 ./dev-python/lxml/lxml-4.6.2.ebuild
 2010141409 ./dev-python/lz4/lz4-3.0.2.ebuild
 2011241809 ./dev-python/lz4/lz4-3.1.1.ebuild
 2009201909 ./dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
 2009201909 ./dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
-2009041409 ./dev-python/m2r/m2r-0.2.1.ebuild
+2011281509 ./dev-python/m2r/m2r-0.2.1.ebuild
 2009201139 ./dev-python/mako/mako-1.1.3-r1.ebuild
 2011040839 ./dev-python/mamba/mamba-0.11.1.ebuild
 2003240909 ./dev-python/mando/mando-0.6.4.ebuild
@@ -12024,7 +12022,7 @@
 2011100139 ./dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
 2011181009 ./dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
 2006292239 ./dev-python/misaka/misaka-2.1.1.ebuild
-2009201909 ./dev-python/mistune/mistune-0.8.4-r1.ebuild
+2011281509 ./dev-python/mistune/mistune-0.8.4-r1.ebuild
 2005091439 ./dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.ebuild
 2005091439 ./dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1.ebuild
 2005091439 ./dev-python/mkdocs/mkdocs-1.1.ebuild
@@ -12032,10 +12030,9 @@
 2009201909 ./dev-python/mock/mock-3.0.5-r2.ebuild
 2008300439 ./dev-python/mongoengine/mongoengine-0.20.0.ebuild
 2011201309 ./dev-python/mongoengine/mongoengine-0.21.0.ebuild
-2009010739 ./dev-python/monotonic/monotonic-1.5-r1.ebuild
-2009201909 ./dev-python/more-itertools/more-itertools-5.0.0-r1.ebuild
+2011281709 ./dev-python/monotonic/monotonic-1.5-r1.ebuild
 2010010139 ./dev-python/more-itertools/more-itertools-8.5.0.ebuild
-2010302039 ./dev-python/more-itertools/more-itertools-8.6.0.ebuild
+2011281109 ./dev-python/more-itertools/more-itertools-8.6.0.ebuild
 2008180909 ./dev-python/moto/moto-1.3.14-r3.ebuild
 2009130209 ./dev-python/moto/moto-1.3.16-r1.ebuild
 2009181339 ./dev-python/moviepy/moviepy-1.0.1-r1.ebuild
@@ -12044,19 +12041,19 @@
 2010272309 ./dev-python/mpmath/mpmath-1.1.0.ebuild
 2007201509 ./dev-python/msgpack/msgpack-0.6.2.ebuild
 2011021309 ./dev-python/msgpack/msgpack-1.0.0.ebuild
-2011231109 ./dev-python/multidict/multidict-5.0.0.ebuild
-2009062039 ./dev-python/munch/munch-2.5.0-r1.ebuild
+2011281109 ./dev-python/multidict/multidict-5.0.0.ebuild
+2011281739 ./dev-python/munch/munch-2.5.0-r1.ebuild
 2001051415 ./dev-python/munkres/munkres-1.1.2.ebuild
 2008301309 ./dev-python/mygpoclient/mygpoclient-1.8.ebuild
 2011181009 ./dev-python/mypy/mypy-0.782.ebuild
 2011182109 ./dev-python/mypy/mypy-0.790.ebuild
-2011262239 ./dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+2011281709 ./dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
 2011271909 ./dev-python/mysql-connector-python/mysql-connector-python-8.0.22.ebuild
 2010111209 ./dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
 2009050139 ./dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
 2009251339 ./dev-python/namespace-google/namespace-google-1-r1.ebuild
-2009251039 ./dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
-2007251138 ./dev-python/namespace-paste/namespace-paste-1-r1.ebuild
+2011281139 ./dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
+2011281709 ./dev-python/namespace-paste/namespace-paste-1-r1.ebuild
 2007140239 ./dev-python/namespace-repoze/namespace-repoze-1.ebuild
 2009041409 ./dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
 2009201909 ./dev-python/namespace-zope/namespace-zope-1-r1.ebuild
@@ -12071,7 +12068,7 @@
 2009060409 ./dev-python/nbval/nbval-0.9.1-r1.ebuild
 2003261841 ./dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
 2004211009 ./dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
-2007300309 ./dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+2011281439 ./dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
 2004240909 ./dev-python/neovim-remote/neovim-remote-9999.ebuild
 2009291339 ./dev-python/neovim-remote/neovim-remote-2.4.0.ebuild
 2010160639 ./dev-python/netaddr/netaddr-0.8.0.ebuild
@@ -12127,7 +12124,7 @@
 2011050809 ./dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
 2001131309 ./dev-python/os-brick/os-brick-2.8.2.ebuild
 2005302109 ./dev-python/os-brick/os-brick-3.0.1.ebuild
-2010180709 ./dev-python/os-brick/os-brick-4.0.1.ebuild
+2011291139 ./dev-python/os-brick/os-brick-4.0.1.ebuild
 2011181309 ./dev-python/os-client-config/os-client-config-2.1.0.ebuild
 2001131309 ./dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild
 2001131309 ./dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
@@ -12177,6 +12174,8 @@
 2011271909 ./dev-python/ovsdbapp/ovsdbapp-1.5.0.ebuild
 2011181009 ./dev-python/owslib/owslib-0.20.0.ebuild
 2009201909 ./dev-python/packaging/packaging-20.4-r1.ebuild
+2011281209 ./dev-python/packaging/packaging-20.5.ebuild
+2011282309 ./dev-python/packaging/packaging-20.7.ebuild
 2001311139 ./dev-python/pafy/pafy-0.5.5.ebuild
 2001311139 ./dev-python/pafy/pafy-9999.ebuild
 2003251509 ./dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
@@ -12195,12 +12194,12 @@
 2009201309 ./dev-python/parso/parso-0.7.1-r1.ebuild
 2008180909 ./dev-python/partd/partd-1.1.0.ebuild
 2011040409 ./dev-python/parver/parver-0.3.1.ebuild
-2011221539 ./dev-python/passlib/passlib-1.7.4.ebuild
+2011281709 ./dev-python/passlib/passlib-1.7.4.ebuild
 2011150839 ./dev-python/paste/paste-3.5.0.ebuild
-2011150839 ./dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
+2011281739 ./dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
 2006301639 ./dev-python/path-and-address/path-and-address-2.0.1.ebuild
-2009301539 ./dev-python/path-py/path-py-15.0.0.ebuild
-2009201909 ./dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
+2011281739 ./dev-python/path-py/path-py-15.0.0.ebuild
+2011281709 ./dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
 2011040839 ./dev-python/pathtools/pathtools-0.1.2-r3.ebuild
 2009181339 ./dev-python/patsy/patsy-0.5.1.ebuild
 2007201809 ./dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
@@ -12225,14 +12224,14 @@
 2006062209 ./dev-python/pillow/pillow-7.0.0.ebuild
 2011242239 ./dev-python/pillow/pillow-7.2.0.ebuild
 2011272309 ./dev-python/pillow/pillow-8.0.1.ebuild
-2011261009 ./dev-python/pip/pip-20.2.4.ebuild
+2011281909 ./dev-python/pip/pip-20.2.4.ebuild
 2010121609 ./dev-python/pipenv/pipenv-2020.8.13.ebuild
 2011120039 ./dev-python/pipenv/pipenv-2020.11.4.ebuild
 2008172209 ./dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
-2009201309 ./dev-python/pkginfo/pkginfo-1.5.0.1-r1.ebuild
+2011281709 ./dev-python/pkginfo/pkginfo-1.5.0.1-r1.ebuild
 2001051415 ./dev-python/plotly/plotly-1.9.6.ebuild
 2011091109 ./dev-python/plotly/plotly-4.10.0.ebuild
-2010160809 ./dev-python/pluggy/pluggy-0.13.1-r1.ebuild
+2011281109 ./dev-python/pluggy/pluggy-0.13.1-r1.ebuild
 2006020009 ./dev-python/pluginbase/pluginbase-1.0.0.ebuild
 2003251909 ./dev-python/plumbum/plumbum-1.6.8.ebuild
 2009252309 ./dev-python/ply/ply-3.11-r1.ebuild
@@ -12245,7 +12244,7 @@
 2008231509 ./dev-python/polib/polib-1.1.0-r1.ebuild
 2004251239 ./dev-python/polygon/polygon-3.0.7.ebuild
 2010152209 ./dev-python/portend/portend-2.6.ebuild
-2011171239 ./dev-python/portend/portend-2.7.0.ebuild
+2011281839 ./dev-python/portend/portend-2.7.0.ebuild
 2005101838 ./dev-python/poyo/poyo-0.5.0.ebuild
 2010182239 ./dev-python/precis-i18n/precis-i18n-1.0.2.ebuild
 2009201909 ./dev-python/pretend/pretend-1.0.9-r1.ebuild
@@ -12253,7 +12252,7 @@
 2008021209 ./dev-python/prettytable/prettytable-0.7.2-r1.ebuild
 2011181239 ./dev-python/prettytable/prettytable-2.0.0.ebuild
 2009041409 ./dev-python/priority/priority-1.3.0.ebuild
-2010091139 ./dev-python/process-tests/process-tests-2.1.1.ebuild
+2011281709 ./dev-python/process-tests/process-tests-2.1.1.ebuild
 2011150839 ./dev-python/progress/progress-1.5.ebuild
 2009181309 ./dev-python/progressbar/progressbar-2.5.ebuild
 2001182209 ./dev-python/progressbar2/progressbar2-3.39.3.ebuild
@@ -12270,12 +12269,12 @@
 2011241639 ./dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
 2009201339 ./dev-python/psutil/psutil-5.7.0-r1.ebuild
 2009201339 ./dev-python/psutil/psutil-5.7.2-r1.ebuild
-2011261409 ./dev-python/psutil/psutil-5.7.3.ebuild
+2011290339 ./dev-python/psutil/psutil-5.7.3.ebuild
 2009201639 ./dev-python/psycopg/psycopg-2.8.5-r1.ebuild
 2009201639 ./dev-python/psycopg/psycopg-2.8.6-r1.ebuild
 2010162139 ./dev-python/ptpython/ptpython-2.0.6.ebuild
 2004260739 ./dev-python/ptvsd/ptvsd-4.3.2.ebuild
-2009201739 ./dev-python/ptyprocess/ptyprocess-0.6.0-r1.ebuild
+2011281839 ./dev-python/ptyprocess/ptyprocess-0.6.0-r1.ebuild
 2011051539 ./dev-python/publicsuffix/publicsuffix-2.20191221.ebuild
 2007180239 ./dev-python/pudb/pudb-2019.2.ebuild
 2003171139 ./dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
@@ -12294,10 +12293,10 @@
 2004182109 ./dev-python/pyGPG/pyGPG-9999.ebuild
 2006110539 ./dev-python/pyTenable/pyTenable-1.1.3.ebuild
 2010101039 ./dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
-2007300309 ./dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+2011281539 ./dev-python/pyaes/pyaes-1.6.1-r2.ebuild
 2005042009 ./dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
 2009181339 ./dev-python/pyamg/pyamg-3.2.1-r1.ebuild
-2009201639 ./dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
+2011281439 ./dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
 2009201639 ./dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
 2009112009 ./dev-python/pyatspi/pyatspi-2.36.0.ebuild
 2008051739 ./dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
@@ -12337,7 +12336,7 @@
 2011021909 ./dev-python/pyfakefs/pyfakefs-4.2.1.ebuild
 2011192139 ./dev-python/pyfakefs/pyfakefs-4.3.0.ebuild
 2011241109 ./dev-python/pyfakefs/pyfakefs-4.3.1.ebuild
-2011261839 ./dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
+2011281139 ./dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
 2003081509 ./dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
 2010030339 ./dev-python/pyflakes/pyflakes-2.2.0.ebuild
 2008021239 ./dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -12365,7 +12364,7 @@
 2010091139 ./dev-python/pygraphviz/pygraphviz-1.6.ebuild
 2009071139 ./dev-python/pygresql/pygresql-5.2.ebuild
 2009221309 ./dev-python/pyh2o/pyh2o-1.ebuild
-2009041409 ./dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
+2011281509 ./dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
 2008071509 ./dev-python/pyilmbase/pyilmbase-2.5.2-r1.ebuild
 2008221239 ./dev-python/pyinotify/pyinotify-0.9.6.ebuild
 2009201609 ./dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
@@ -12374,10 +12373,11 @@
 2011192309 ./dev-python/pykka/pykka-2.0.2.ebuild
 2011271239 ./dev-python/pykka/pykka-2.0.3.ebuild
 2011192309 ./dev-python/pykwalify/pykwalify-1.7.0.ebuild
-2010170109 ./dev-python/pylama/pylama-7.7.1-r1.ebuild
+2011281909 ./dev-python/pylama/pylama-7.7.1-r1.ebuild
 2011232009 ./dev-python/pylast/pylast-4.0.0.ebuild
 2004240909 ./dev-python/pylibacl/pylibacl-0.5.3.ebuild
 2011060139 ./dev-python/pylibacl/pylibacl-0.5.4_p20191217.ebuild
+2011291139 ./dev-python/pylibacl/pylibacl-0.6.0.ebuild
 2007140239 ./dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
 2011151239 ./dev-python/pylint/pylint-2.6.0.ebuild
 2001051415 ./dev-python/pymad/pymad-0.10.ebuild
@@ -12401,6 +12401,7 @@
 2009252339 ./dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild
 2008051739 ./dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
 2009201639 ./dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
+2011281209 ./dev-python/pyopenssl/pyopenssl-20.0.0.ebuild
 2003190539 ./dev-python/pyotherside/pyotherside-1.5.9.ebuild
 2010170709 ./dev-python/pyotp/pyotp-2.4.1.ebuild
 2009201309 ./dev-python/pypam/pypam-0.5.0-r6.ebuild
@@ -12415,8 +12416,7 @@
 2005121009 ./dev-python/pyphen/pyphen-0.9.5.ebuild
 2011020309 ./dev-python/pyphen/pyphen-0.10.0.ebuild
 2007201509 ./dev-python/pypng/pypng-0.0.20.ebuild
-2003162209 ./dev-python/pypowervm/pypowervm-1.1.20.ebuild
-2010190239 ./dev-python/pypowervm/pypowervm-1.1.24.ebuild
+2011291139 ./dev-python/pypowervm/pypowervm-1.1.24.ebuild
 2003190639 ./dev-python/pyprof2calltree/pyprof2calltree-1.4.4.ebuild
 2011181009 ./dev-python/pyproj/pyproj-2.6.1_p1.ebuild
 2009172012 ./dev-python/pypy/pypy-7.3.1-r3.ebuild
@@ -12434,7 +12434,7 @@
 2009050039 ./dev-python/pyqt-distutils/pyqt-distutils-0.7.3.ebuild
 2011220109 ./dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
 2009071209 ./dev-python/pyquery/pyquery-1.4.1-r1.ebuild
-2011220009 ./dev-python/pyquery/pyquery-1.4.3.ebuild
+2011281909 ./dev-python/pyquery/pyquery-1.4.3.ebuild
 2009190309 ./dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
 2007091709 ./dev-python/pyro/pyro-4.80.ebuild
 2011160309 ./dev-python/pyroute2/pyroute2-0.5.14.ebuild
@@ -12443,7 +12443,7 @@
 2011271909 ./dev-python/pysaml2/pysaml2-6.1.0.ebuild
 2009071209 ./dev-python/pyscard/pyscard-1.9.9.ebuild
 2009041409 ./dev-python/pyserial/pyserial-3.4.ebuild
-2011231139 ./dev-python/pyserial/pyserial-3.5.ebuild
+2011281509 ./dev-python/pyserial/pyserial-3.5.ebuild
 2004180139 ./dev-python/pysmi/pysmi-0.3.4.ebuild
 2003251039 ./dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
 2004180139 ./dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
@@ -12456,8 +12456,8 @@
 2006141709 ./dev-python/pysvn/pysvn-1.9.11.ebuild
 2010162139 ./dev-python/pytables/pytables-3.6.1.ebuild
 2006021508 ./dev-python/pyte/pyte-0.8.0-r1.ebuild
-2011262239 ./dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
-2011120239 ./dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
+2011281909 ./dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+2011282009 ./dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
 2008231509 ./dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
 2008021239 ./dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
 2011181209 ./dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -12470,10 +12470,10 @@
 2009211939 ./dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
 2010310511 ./dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
 2001051415 ./dev-python/pytest-html/pytest-html-1.22.1.ebuild
-2009211939 ./dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
-2009211939 ./dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+2011281139 ./dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
+2011281739 ./dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
 2002052339 ./dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
-2009211939 ./dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
+2011281139 ./dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
 2009211939 ./dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
 2010141839 ./dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild
 2011172239 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
@@ -12485,14 +12485,14 @@
 2011181209 ./dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
 2009211939 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
 2009211939 ./dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild
-2009241009 ./dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
+2011281209 ./dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
 2010302039 ./dev-python/pytest-xprocess/pytest-xprocess-0.16.0.ebuild
 2011150839 ./dev-python/pytest-xprocess/pytest-xprocess-0.15.0.ebuild
 2011271239 ./dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
 2007120109 ./dev-python/pytest/pytest-5.4.3.ebuild
 2009201909 ./dev-python/pytest/pytest-4.6.11-r1.ebuild
-2010282309 ./dev-python/pytest/pytest-6.1.2.ebuild
 2011261409 ./dev-python/pytest/pytest-6.1.1.ebuild
+2011281139 ./dev-python/pytest/pytest-6.1.2.ebuild
 2007111109 ./dev-python/python-augeas/python-augeas-1.1.0.ebuild
 2008250139 ./dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
 2008250139 ./dev-python/python-axolotl/python-axolotl-0.2.3-r1.ebuild
@@ -12513,11 +12513,10 @@
 2005032209 ./dev-python/python-discid/python-discid-1.2.0.ebuild
 2008051739 ./dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
 2007080039 ./dev-python/python-docs/python-docs-2.7.18.ebuild
-2008222139 ./dev-python/python-docs/python-docs-3.8.5.ebuild
 2010220209 ./dev-python/python-docs/python-docs-3.6.12.ebuild
 2010220209 ./dev-python/python-docs/python-docs-3.7.9.ebuild
-2010220209 ./dev-python/python-docs/python-docs-3.8.6.ebuild
 2010220209 ./dev-python/python-docs/python-docs-3.9.0.ebuild
+2011290109 ./dev-python/python-docs/python-docs-3.8.6.ebuild
 2010171239 ./dev-python/python-editor/python-editor-1.0.4-r1.ebuild
 2011121039 ./dev-python/python-efl/python-efl-1.25.0.ebuild
 2004220439 ./dev-python/python-engineio/python-engineio-3.12.1.ebuild
@@ -12549,7 +12548,7 @@
 2011040409 ./dev-python/python-memcached/python-memcached-1.59-r1.ebuild
 2011191439 ./dev-python/python-mistralclient/python-mistralclient-4.1.1.ebuild
 2011191439 ./dev-python/python-monascaclient/python-monascaclient-2.2.1.ebuild
-2011270209 ./dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
+2011281239 ./dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
 2007111139 ./dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
 2010182239 ./dev-python/python-nbxmpp/python-nbxmpp-1.0.2.ebuild
 2004261209 ./dev-python/python-netlink/python-netlink-0.1.ebuild
@@ -12619,14 +12618,14 @@
 2010272309 ./dev-python/rarfile/rarfile-3.1.ebuild
 2004261339 ./dev-python/ratelimit/ratelimit-1.4.1.ebuild
 2007302339 ./dev-python/rdflib/rdflib-5.0.0.ebuild
-2011261009 ./dev-python/readme_renderer/readme_renderer-28.0.ebuild
+2011281839 ./dev-python/readme_renderer/readme_renderer-28.0.ebuild
 2010272309 ./dev-python/rebulk/rebulk-2.0.1.ebuild
 2005171109 ./dev-python/recommonmark/recommonmark-0.6.0.ebuild
 2009040409 ./dev-python/redis-py/redis-py-3.5.3.ebuild
 2011232009 ./dev-python/redis-py/redis-py-3.3.11.ebuild
 2001182209 ./dev-python/rednose/rednose-0.4.3.ebuild
 2006090639 ./dev-python/reflink/reflink-0.2.1-r1.ebuild
-2009201309 ./dev-python/regex/regex-2020.4.4-r1.ebuild
+2011281709 ./dev-python/regex/regex-2020.4.4-r1.ebuild
 2010141409 ./dev-python/rencode/rencode-1.0.6.ebuild
 2011170609 ./dev-python/reno/reno-3.2.0-r1.ebuild
 2010091139 ./dev-python/reportlab/reportlab-3.5.48.ebuild
@@ -12639,9 +12638,9 @@
 2010162139 ./dev-python/requests-mock/requests-mock-1.8.0.ebuild
 2004200209 ./dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
 2006092339 ./dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
-2007251138 ./dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+2011281839 ./dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
 2009201339 ./dev-python/requests/requests-2.24.0-r1.ebuild
-2011120009 ./dev-python/requests/requests-2.25.0.ebuild
+2011281139 ./dev-python/requests/requests-2.25.0.ebuild
 2006110539 ./dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild
 2010102339 ./dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
 2009260809 ./dev-python/responses/responses-0.12.0.ebuild
@@ -12650,7 +12649,7 @@
 2001051415 ./dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
 2007111139 ./dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
 2009241839 ./dev-python/retrying/retrying-1.3.3.ebuild
-2009062039 ./dev-python/rfc3986/rfc3986-1.4.0.ebuild
+2011281739 ./dev-python/rfc3986/rfc3986-1.4.0.ebuild
 2008021239 ./dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
 2005121009 ./dev-python/roman/roman-3.2.ebuild
 2010132139 ./dev-python/rope/rope-0.17.0.ebuild
@@ -12677,23 +12676,23 @@
 2008180909 ./dev-python/s3transfer/s3transfer-0.3.3.ebuild
 2010200039 ./dev-python/sabyenc/sabyenc-4.0.2.ebuild
 2011192309 ./dev-python/scandir/scandir-1.10.0-r2.ebuild
-2009201309 ./dev-python/scripttest/scripttest-1.3.0-r1.ebuild
-2011021309 ./dev-python/scrypt/scrypt-0.8.16.ebuild
+2011281739 ./dev-python/scripttest/scripttest-1.3.0-r1.ebuild
+2011281709 ./dev-python/scrypt/scrypt-0.8.16.ebuild
 2009181339 ./dev-python/seaborn/seaborn-0.10.1.ebuild
 2009062039 ./dev-python/secretstorage/secretstorage-3.1.2.ebuild
 2011080039 ./dev-python/secretstorage/secretstorage-3.2.0.ebuild
 2011251209 ./dev-python/secretstorage/secretstorage-3.3.0.ebuild
-2009282109 ./dev-python/selenium/selenium-3.141.0-r1.ebuild
+2011281839 ./dev-python/selenium/selenium-3.141.0-r1.ebuild
 2011142209 ./dev-python/semantic_version/semantic_version-2.8.5.ebuild
 2010240109 ./dev-python/semver/semver-2.13.0.ebuild
 2006092309 ./dev-python/send2trash/send2trash-1.5.0-r1.ebuild
 2005011909 ./dev-python/serpent/serpent-1.30.ebuild
 2011182139 ./dev-python/serpent/serpent-1.30.2.ebuild
 2004261339 ./dev-python/serverfiles/serverfiles-0.2.1.ebuild
-2009201409 ./dev-python/service_identity/service_identity-18.1.0-r1.ebuild
+2011281439 ./dev-python/service_identity/service_identity-18.1.0-r1.ebuild
 2009282109 ./dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
 2011251209 ./dev-python/setproctitle/setproctitle-1.2.ebuild
-2009201309 ./dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
+2011281909 ./dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
 2009291809 ./dev-python/setuptools/setuptools-46.4.0-r3.ebuild
 2011031639 ./dev-python/setuptools/setuptools-50.3.0.ebuild
 2010081439 ./dev-python/setuptools_scm/setuptools_scm-4.1.2-r1.ebuild
@@ -12712,7 +12711,6 @@
 2009181339 ./dev-python/simplespectral/simplespectral-1.0.0.ebuild
 2009181339 ./dev-python/simplespectral/simplespectral-9999.ebuild
 2008010139 ./dev-python/simpy/simpy-3.0.13.ebuild
-2008020239 ./dev-python/sip/sip-4.19.22-r1.ebuild
 2011120339 ./dev-python/sip/sip-4.19.24.ebuild
 2009261909 ./dev-python/six/six-1.15.0-r1.ebuild
 2004261339 ./dev-python/slimit/slimit-0.8.1-r1.ebuild
@@ -12721,16 +12719,16 @@
 2010281039 ./dev-python/slixmpp/slixmpp-9999.ebuild
 2007081609 ./dev-python/smmap/smmap-3.0.4.ebuild
 2003120039 ./dev-python/smmap2/smmap2-2.0.3.ebuild
-2005301039 ./dev-python/snakeoil/snakeoil-0.8.8.ebuild
 2005301039 ./dev-python/snakeoil/snakeoil-9999.ebuild
+2011281109 ./dev-python/snakeoil/snakeoil-0.8.8.ebuild
 2010162139 ./dev-python/snappy/snappy-0.5.1-r1.ebuild
-2009041409 ./dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
+2011281639 ./dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
 2001051415 ./dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
 2011090239 ./dev-python/socketio-client/socketio-client-0.7.2.ebuild
-2007251138 ./dev-python/socketpool/socketpool-0.5.3-r3.ebuild
+2011281839 ./dev-python/socketpool/socketpool-0.5.3-r3.ebuild
 2008180909 ./dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
 2009201909 ./dev-python/sortedcontainers/sortedcontainers-2.2.2-r1.ebuild
-2011091139 ./dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
+2011281139 ./dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
 2006202339 ./dev-python/sparql-wrapper/sparql-wrapper-1.8.5.ebuild
 2006241039 ./dev-python/speaklater/speaklater-1.3-r1.ebuild
 2010182239 ./dev-python/speg/speg-0.3-r1.ebuild
@@ -12813,7 +12811,7 @@
 2010221039 ./dev-python/tempita/tempita-0.5.3-r3.ebuild
 2009062039 ./dev-python/tempora/tempora-3.0.0.ebuild
 2009260809 ./dev-python/tempora/tempora-4.0.0.ebuild
-2010311139 ./dev-python/tempora/tempora-4.0.1.ebuild
+2011281839 ./dev-python/tempora/tempora-4.0.1.ebuild
 2010182239 ./dev-python/tenacity/tenacity-6.2.0.ebuild
 2008021239 ./dev-python/termcolor/termcolor-1.1.0-r2.ebuild
 2006211839 ./dev-python/terminado/terminado-0.8.3.ebuild
@@ -12821,7 +12819,7 @@
 2007300909 ./dev-python/terminaltables/terminaltables-3.1.0.ebuild
 2007300909 ./dev-python/terminaltables/terminaltables-9999.ebuild
 2011172239 ./dev-python/testfixtures/testfixtures-6.15.0.ebuild
-2008011209 ./dev-python/testpath/testpath-0.4.4-r1.ebuild
+2011281839 ./dev-python/testpath/testpath-0.4.4-r1.ebuild
 2004032241 ./dev-python/testrepository/testrepository-0.0.20.ebuild
 2005311909 ./dev-python/testresources/testresources-2.0.1.ebuild
 2009201909 ./dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
@@ -12838,7 +12836,7 @@
 2006161339 ./dev-python/tld/tld-0.12.2.ebuild
 2002061009 ./dev-python/tldextract/tldextract-2.2.1.ebuild
 2009201909 ./dev-python/toml/toml-0.10.1-r1.ebuild
-2011111209 ./dev-python/toml/toml-0.10.2.ebuild
+2011281139 ./dev-python/toml/toml-0.10.2.ebuild
 2011040409 ./dev-python/toolz/toolz-0.11.1.ebuild
 2011271909 ./dev-python/tooz/tooz-2.7.1.ebuild
 2011150839 ./dev-python/tox/tox-3.20.1.ebuild
@@ -12846,6 +12844,7 @@
 2007251138 ./dev-python/tqdm/tqdm-9999.ebuild
 2011221509 ./dev-python/tqdm/tqdm-4.53.0.ebuild
 2011260909 ./dev-python/tqdm/tqdm-4.51.0.ebuild
+2011281739 ./dev-python/tqdm/tqdm-4.54.0.ebuild
 2009210939 ./dev-python/traceback2/traceback2-1.4.0-r1.ebuild
 2008030639 ./dev-python/traitlets/traitlets-4.3.3.ebuild
 2011191309 ./dev-python/traitlets/traitlets-5.0.5.ebuild
@@ -12853,9 +12852,9 @@
 2011090239 ./dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild
 2011090239 ./dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild
 2010102209 ./dev-python/treq/treq-20.9.0.ebuild
-2009201409 ./dev-python/trustme/trustme-0.6.0-r1.ebuild
+2011281439 ./dev-python/trustme/trustme-0.6.0-r1.ebuild
 2005291109 ./dev-python/tvdb_api/tvdb_api-2.0-r1.ebuild
-2010152209 ./dev-python/twine/twine-3.2.0.ebuild
+2011281909 ./dev-python/twine/twine-3.2.0.ebuild
 2008041509 ./dev-python/twisted/twisted-19.10.0.ebuild
 2009041409 ./dev-python/twisted/twisted-20.3.0.ebuild
 2005041009 ./dev-python/twython/twython-3.7.0.ebuild
@@ -12863,8 +12862,8 @@
 2007201509 ./dev-python/txaio/txaio-20.4.1.ebuild
 2004261609 ./dev-python/txgithub/txgithub-15.0.0-r1.ebuild
 2005082339 ./dev-python/txrequests/txrequests-0.9.6.ebuild
-2009041409 ./dev-python/typed-ast/typed-ast-1.4.1.ebuild
-2009270039 ./dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
+2011281639 ./dev-python/typed-ast/typed-ast-1.4.1.ebuild
+2011281139 ./dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
 2008191409 ./dev-python/typing/typing-3.7.4.3.ebuild
 2007111239 ./dev-python/tzlocal/tzlocal-2.1.ebuild
 2011260909 ./dev-python/u-msgpack/u-msgpack-2.7.1.ebuild
@@ -12884,13 +12883,13 @@
 2009201409 ./dev-python/urllib3/urllib3-1.24.2-r1.ebuild
 2011110039 ./dev-python/urllib3/urllib3-1.26.0.ebuild
 2011120009 ./dev-python/urllib3/urllib3-1.26.1.ebuild
-2011211839 ./dev-python/urllib3/urllib3-1.26.2.ebuild
 2011261009 ./dev-python/urllib3/urllib3-1.25.11.ebuild
+2011281439 ./dev-python/urllib3/urllib3-1.26.2.ebuild
 2009181139 ./dev-python/urwid/urwid-2.1.1.ebuild
 2008091039 ./dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
 2010120139 ./dev-python/utidylib/utidylib-0.6-r1.ebuild
 2007201509 ./dev-python/uvloop/uvloop-0.14.0.ebuild
-2011150839 ./dev-python/vcrpy/vcrpy-4.1.1.ebuild
+2011281139 ./dev-python/vcrpy/vcrpy-4.1.1.ebuild
 2008171609 ./dev-python/vcstools/vcstools-0.1.42.ebuild
 2008021239 ./dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
 2006160909 ./dev-python/vdirsyncer/vdirsyncer-0.16.8.ebuild
@@ -12900,14 +12899,14 @@
 2011090239 ./dev-python/vine/vine-1.3.0.ebuild
 2003251909 ./dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild
 2009201739 ./dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
-2011232009 ./dev-python/virtualenv/virtualenv-20.2.1.ebuild
 2011261009 ./dev-python/virtualenv/virtualenv-20.1.0.ebuild
+2011281909 ./dev-python/virtualenv/virtualenv-20.2.1.ebuild
 2005020739 ./dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
 2009042209 ./dev-python/visitor/visitor-0.1.3-r1.ebuild
 2010200839 ./dev-python/vobject/vobject-0.9.6.1-r2.ebuild
 2010221039 ./dev-python/voluptuous/voluptuous-0.12.0.ebuild
 2009050939 ./dev-python/vpython/vpython-7.6.1-r2.ebuild
-2007251138 ./dev-python/waitress/waitress-1.4.4.ebuild
+2011281739 ./dev-python/waitress/waitress-1.4.4.ebuild
 2010150939 ./dev-python/warlock/warlock-1.3.3.ebuild
 2009071209 ./dev-python/watchdog/watchdog-0.8.3-r2.ebuild
 2011040839 ./dev-python/watchdog/watchdog-0.10.3.ebuild
@@ -12921,9 +12920,9 @@
 2011040839 ./dev-python/websocket-client/websocket-client-0.57.0.ebuild
 2004232309 ./dev-python/websockify/websockify-0.9.0.ebuild
 2011130209 ./dev-python/websockify/websockify-0.9.0-r1.ebuild
-2010162139 ./dev-python/webtest/webtest-2.0.35.ebuild
+2011281909 ./dev-python/webtest/webtest-2.0.35.ebuild
 2009201339 ./dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
-2009201809 ./dev-python/wheel/wheel-0.35.1-r1.ebuild
+2011281739 ./dev-python/wheel/wheel-0.35.1-r1.ebuild
 2005111439 ./dev-python/whichcraft/whichcraft-0.6.1.ebuild
 2005091339 ./dev-python/whisper/whisper-1.1.5.ebuild
 2009201639 ./dev-python/whoosh/whoosh-2.7.4-r1.ebuild
@@ -12933,7 +12932,7 @@
 2005211809 ./dev-python/ws4py/ws4py-9999.ebuild
 2006300939 ./dev-python/ws4py/ws4py-0.5.1-r1.ebuild
 2007201509 ./dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
-2007251138 ./dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
+2011281909 ./dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
 2008030109 ./dev-python/wsproto/wsproto-0.15.0.ebuild
 2011231139 ./dev-python/wsproto/wsproto-1.0.0.ebuild
 2008021239 ./dev-python/wstools/wstools-0.4.8.ebuild
@@ -12945,6 +12944,7 @@
 2010072209 ./dev-python/xarray/xarray-0.16.0.ebuild
 2011090239 ./dev-python/xarray/xarray-0.16.1.ebuild
 2009100109 ./dev-python/xcffib/xcffib-0.10.1.ebuild
+2011291139 ./dev-python/xcffib/xcffib-0.11.0.ebuild
 2008180909 ./dev-python/xlrd/xlrd-1.2.0.ebuild
 2011160309 ./dev-python/xlsxwriter/xlsxwriter-1.3.7.ebuild
 2010162139 ./dev-python/xlutils/xlutils-2.0.0-r1.ebuild
@@ -12956,15 +12956,15 @@
 2010310511 ./dev-python/yappi/yappi-1.3.0.ebuild
 2005031339 ./dev-python/yapsy/yapsy-1.12.2.ebuild
 2010150939 ./dev-python/yaql/yaql-1.1.3.ebuild
-2011150009 ./dev-python/yarl/yarl-1.6.3.ebuild
 2011231109 ./dev-python/yarl/yarl-1.6.2.ebuild
+2011281139 ./dev-python/yarl/yarl-1.6.3.ebuild
 2011090239 ./dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
 2010190239 ./dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
 2007140239 ./dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
 2002041639 ./dev-python/zeep/zeep-3.4.0.ebuild
 2009191939 ./dev-python/zeroconf/zeroconf-0.24.4.ebuild
 2008180909 ./dev-python/zict/zict-0.1.4.ebuild
-2011261009 ./dev-python/zipp/zipp-3.4.0.ebuild
+2011281139 ./dev-python/zipp/zipp-3.4.0.ebuild
 2010162139 ./dev-python/zope-component/zope-component-4.4.1.ebuild
 2010162139 ./dev-python/zope-configuration/zope-configuration-4.4.0.ebuild
 2010162139 ./dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
@@ -12978,14 +12978,14 @@
 2010162139 ./dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
 2009201309 ./dev-python/zstandard/zstandard-0.14.0-r1.ebuild
 2009201309 ./dev-python/zstandard/zstandard-0.8.1-r1.ebuild
-2009041409 ./dev-python/pathspec/pathspec-0.8.0.ebuild
+2011281109 ./dev-python/pathspec/pathspec-0.8.0.ebuild
 2011172339 ./dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
 2001271039 ./dev-python/test_server/test_server-0.0.31.ebuild
 2009041409 ./dev-python/click-default-group/click-default-group-1.2.2.ebuild
 2010180309 ./dev-python/elementpath/elementpath-2.0.3.ebuild
-2010302039 ./dev-python/elementpath/elementpath-2.0.4.ebuild
-2009062039 ./dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
-2011150839 ./dev-python/pypiserver/pypiserver-1.4.2.ebuild
+2011281139 ./dev-python/elementpath/elementpath-2.0.4.ebuild
+2011281839 ./dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
+2011281909 ./dev-python/pypiserver/pypiserver-1.4.2.ebuild
 2010302039 ./dev-python/pytest-services/pytest-services-2.2.1.ebuild
 2011041409 ./dev-python/pytest-services/pytest-services-2.2.0.ebuild
 2008021239 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -12995,8 +12995,8 @@
 2010201009 ./dev-python/xmlschema/xmlschema-1.2.4.ebuild
 2011021309 ./dev-python/xmlschema/xmlschema-1.2.5.ebuild
 2011091739 ./dev-python/xmlschema/xmlschema-1.3.0.ebuild
-2011101709 ./dev-python/xmlschema/xmlschema-1.3.1.ebuild
-2007120609 ./dev-python/soupsieve/soupsieve-2.0.1.ebuild
+2011281139 ./dev-python/xmlschema/xmlschema-1.3.1.ebuild
+2011281909 ./dev-python/soupsieve/soupsieve-2.0.1.ebuild
 2010182239 ./dev-python/alagitpull/alagitpull-0.0.23-r1.ebuild
 2008021209 ./dev-python/pipfile/pipfile-0.0.2.ebuild
 1912080109 ./dev-python/flit/flit-2.1.0.ebuild
@@ -13017,7 +13017,7 @@
 2011121239 ./dev-python/pybind11/pybind11-2.6.1.ebuild
 2011270209 ./dev-python/pybind11/pybind11-2.6.0.ebuild
 2010221039 ./dev-python/pyproject2setuppy/pyproject2setuppy-8.ebuild
-2011220109 ./dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
+2011281739 ./dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
 2008292109 ./dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild
 2009261709 ./dev-python/pypy-exe-bin/pypy-exe-bin-7.3.2.ebuild
 2011131509 ./dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_rc1.ebuild
@@ -13084,7 +13084,7 @@
 2011201739 ./dev-python/sentry-sdk/sentry-sdk-0.19.4.ebuild
 2011261209 ./dev-python/sentry-sdk/sentry-sdk-0.19.1.ebuild
 2010141239 ./dev-python/tikzplotlib/tikzplotlib-0.9.4.ebuild
-2010202109 ./dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+2011281739 ./dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
 2009151139 ./dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild
 2009151139 ./dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild
 2011171739 ./dev-python/spyder-notebook/spyder-notebook-0.3.1.ebuild
@@ -13115,19 +13115,20 @@
 2011172139 ./dev-python/lunr/lunr-0.5.6.ebuild
 2005091439 ./dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
 2004161009 ./dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
-2011181239 ./dev-python/distlib/distlib-0.3.1-r1.ebuild
+2011281709 ./dev-python/distlib/distlib-0.3.1-r1.ebuild
 2010310511 ./dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
 2011232009 ./dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
 2010010039 ./dev-python/websockets/websockets-8.1.ebuild
 2008072239 ./dev-python/cppy/cppy-1.1.0.ebuild
 2011262239 ./dev-python/dataclasses/dataclasses-0.7.ebuild
 2010151039 ./dev-python/blessed/blessed-1.17.11.ebuild
+2011281539 ./dev-python/blessed/blessed-1.17.12.ebuild
 2007310409 ./dev-python/pebble/pebble-4.5.3.ebuild
 2008180909 ./dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
 2010162139 ./dev-python/nose-random/nose-random-1.0.0.ebuild
 2006190009 ./dev-python/python-slugify/python-slugify-1.2.6.ebuild
 2008220909 ./dev-python/python-slugify/python-slugify-4.0.1.ebuild
-2009202339 ./dev-python/csv23/csv23-0.3.2-r1.ebuild
+2011281839 ./dev-python/csv23/csv23-0.3.2-r1.ebuild
 2007260139 ./dev-python/aiofiles/aiofiles-0.5.0.ebuild
 2011151409 ./dev-python/asgiref/asgiref-3.3.0.ebuild
 2011190409 ./dev-python/asgiref/asgiref-3.3.1.ebuild
@@ -13152,7 +13153,7 @@
 2011090239 ./dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
 2011171739 ./dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild
 2009201909 ./dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
-2011262239 ./dev-python/black/black-20.8_beta1.ebuild
+2011281709 ./dev-python/black/black-20.8_beta1.ebuild
 2007260239 ./dev-python/klein/klein-20.6.0.ebuild
 2011090409 ./dev-python/python-dotenv/python-dotenv-0.15.0.ebuild
 2011130809 ./dev-python/python-dotenv/python-dotenv-0.14.0.ebuild
@@ -13170,7 +13171,7 @@
 2009040809 ./dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
 2006281409 ./dev-python/latexcodec/latexcodec-2.0.0.ebuild
 2006281409 ./dev-python/pybtex/pybtex-0.22.2.ebuild
-2011172209 ./dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+2011281439 ./dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
 2007151339 ./dev-python/findimports/findimports-1.5.2.ebuild
 2009040809 ./dev-python/pony/pony-0.7.13.ebuild
 2011241109 ./dev-python/pony/pony-0.7.14.ebuild
@@ -13181,7 +13182,7 @@
 2009202339 ./dev-python/quantities/quantities-0.12.4.ebuild
 2009211840 ./dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
 2008051739 ./dev-python/PyICU/PyICU-2.5.ebuild
-2011261409 ./dev-python/iniconfig/iniconfig-1.0.0.ebuild
+2011281109 ./dev-python/iniconfig/iniconfig-1.0.0.ebuild
 2010131439 ./dev-python/osrf_pycommon/osrf_pycommon-0.1.10-r1.ebuild
 2010131309 ./dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
 2010131309 ./dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
@@ -13248,7 +13249,7 @@
 2010121909 ./dev-python/imread/imread-0.7.3.ebuild
 2010131539 ./dev-python/exdown/exdown-0.7.0.ebuild
 2010200039 ./dev-python/zstd/zstd-1.4.5.1.ebuild
-2011201739 ./dev-python/re-assert/re-assert-1.1.0.ebuild
+2011290339 ./dev-python/re-assert/re-assert-1.1.0.ebuild
 2010292009 ./dev-python/libpy_simdjson/libpy_simdjson-0.4.0.ebuild
 2011090239 ./dev-python/braintree/braintree-4.4.0.ebuild
 2011091109 ./dev-python/chart-studio/chart-studio-1.1.0.ebuild
@@ -13257,6 +13258,7 @@
 2011171739 ./dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
 2011171739 ./dev-python/three-merge/three-merge-0.1.1.ebuild
 2011260139 ./dev-python/pytaglib/pytaglib-1.4.6.ebuild
+2011281239 ./dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
 2010181809 ./dev-qt/assistant/assistant-5.15.1.ebuild
 2011260209 ./dev-qt/assistant/assistant-5.15.2.ebuild
 2010181809 ./dev-qt/designer/designer-5.15.1.ebuild
@@ -13312,7 +13314,7 @@
 2010181809 ./dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild
 2011260209 ./dev-qt/qtmultimedia/qtmultimedia-5.15.2.ebuild
 2011190039 ./dev-qt/qtnetwork/qtnetwork-5.15.1-r1.ebuild
-2011260209 ./dev-qt/qtnetwork/qtnetwork-5.15.2.ebuild
+2011282339 ./dev-qt/qtnetwork/qtnetwork-5.15.2.ebuild
 2010181809 ./dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild
 2011260209 ./dev-qt/qtnetworkauth/qtnetworkauth-5.15.2.ebuild
 2010181809 ./dev-qt/qtopengl/qtopengl-5.15.1.ebuild
@@ -14879,7 +14881,7 @@
 2007170409 ./dev-ruby/octokit/octokit-4.18.0-r1.ebuild
 2010241209 ./dev-ruby/octokit/octokit-4.19.0.ebuild
 2003031039 ./dev-ruby/omniauth/omniauth-1.9.1.ebuild
-2009220939 ./dev-ruby/open4/open4-1.3.4.ebuild
+2011290339 ./dev-ruby/open4/open4-1.3.4.ebuild
 2008011209 ./dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
 2004220909 ./dev-ruby/optimist/optimist-3.0.1.ebuild
 2008011209 ./dev-ruby/optionable/optionable-0.2.0.ebuild
@@ -14940,7 +14942,7 @@
 2004180839 ./dev-ruby/power_assert/power_assert-1.2.0.ebuild
 2007310939 ./dev-ruby/prawn-table/prawn-table-0.2.2-r1.ebuild
 2004122139 ./dev-ruby/prawn/prawn-2.2.2.ebuild
-2009220939 ./dev-ruby/pry/pry-0.13.1.ebuild
+2011290339 ./dev-ruby/pry/pry-0.13.1.ebuild
 2004191539 ./dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
 2005100909 ./dev-ruby/public_suffix/public_suffix-4.0.5.ebuild
 2009190909 ./dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
@@ -15533,7 +15535,7 @@
 1803191008 ./dev-scheme/scm/scm-5.5.6-r3.ebuild
 2002112051 ./dev-scheme/scm/scm-5.5.6-r4.ebuild
 1708031456 ./dev-scheme/scmxlate/scmxlate-20090410-r1.ebuild
-1708031448 ./dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
+2011290239 ./dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
 2004032241 ./dev-scheme/slib/slib-3.2.5-r1.ebuild
 2011170309 ./dev-scheme/stklos/stklos-1.10-r1.ebuild
 1708031219 ./dev-scheme/termite/termite-0.15-r1.ebuild
@@ -15689,19 +15691,11 @@
 2005042309 ./dev-util/abootimg/abootimg-20150323.ebuild
 1702282250 ./dev-util/ald/ald-0.1.7-r2.ebuild
 1912111539 ./dev-util/amtterm/amtterm-1.6.ebuild
-1905132109 ./dev-util/android-ndk/android-ndk-10.ebuild
-1905132109 ./dev-util/android-ndk/android-ndk-10b.ebuild
-1905132109 ./dev-util/android-ndk/android-ndk-10d.ebuild
-1910012239 ./dev-util/android-ndk/android-ndk-10e.ebuild
 1910012239 ./dev-util/android-ndk/android-ndk-11c-r1.ebuild
 1910012239 ./dev-util/android-ndk/android-ndk-11c.ebuild
 1910012239 ./dev-util/android-ndk/android-ndk-13b.ebuild
 1910012239 ./dev-util/android-ndk/android-ndk-14b.ebuild
 1910012239 ./dev-util/android-ndk/android-ndk-16b.ebuild
-1905132109 ./dev-util/android-ndk/android-ndk-9.ebuild
-1905132109 ./dev-util/android-ndk/android-ndk-9b.ebuild
-1905132109 ./dev-util/android-ndk/android-ndk-9c.ebuild
-1905132109 ./dev-util/android-ndk/android-ndk-9d.ebuild
 1912192109 ./dev-util/android-ndk/android-ndk-18.ebuild
 2002230040 ./dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
 2007231709 ./dev-util/android-studio/android-studio-4.0.1.0.193.6626763.ebuild
@@ -15720,13 +15714,12 @@
 2007231809 ./dev-util/aruba/aruba-0.14.14.ebuild
 2007231809 ./dev-util/aruba/aruba-1.0.2.ebuild
 2009140939 ./dev-util/aruba/aruba-1.0.3.ebuild
-2009242139 ./dev-util/aruba/aruba-1.0.3-r1.ebuild
 2011060639 ./dev-util/aruba/aruba-0.6.2-r2.ebuild
+2011290339 ./dev-util/aruba/aruba-1.0.3-r1.ebuild
 1805290138 ./dev-util/astyle/astyle-3.0.1-r1.ebuild
 2002262139 ./dev-util/astyle/astyle-3.1-r2.ebuild
 2002112051 ./dev-util/autodia/autodia-2.140.0-r2.ebuild
 1910181539 ./dev-util/autoproject/autoproject-0.20_p5.ebuild
-2005172009 ./dev-util/babeltrace/babeltrace-1.2.3.ebuild
 2005172009 ./dev-util/babeltrace/babeltrace-1.2.4.ebuild
 1702282250 ./dev-util/bats/bats-0.4.0.ebuild
 2003311309 ./dev-util/bats/bats-0.4.0_p20170219.ebuild
@@ -15835,7 +15828,7 @@
 2010091209 ./dev-util/cmake/cmake-3.17.4-r1.ebuild
 2011191309 ./dev-util/cmake/cmake-3.18.5.ebuild
 2011191839 ./dev-util/cmake/cmake-3.19.0.ebuild
-2011242309 ./dev-util/cmake/cmake-3.19.1.ebuild
+2011281839 ./dev-util/cmake/cmake-3.19.1.ebuild
 2004032241 ./dev-util/cmocka/cmocka-1.1.5.ebuild
 2004080939 ./dev-util/codeblocks/codeblocks-9999.ebuild
 2007061039 ./dev-util/codeblocks/codeblocks-20.03-r1.ebuild
@@ -15891,7 +15884,7 @@
 2011060639 ./dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
 2007220809 ./dev-util/cucumber/cucumber-3.2.0.ebuild
 2011060639 ./dev-util/cucumber/cucumber-3.1.2.ebuild
-2004032241 ./dev-util/cunit/cunit-2.1_p3.ebuild
+2011281539 ./dev-util/cunit/cunit-2.1_p3.ebuild
 2002230040 ./dev-util/cutils/cutils-1.6-r4.ebuild
 2009040139 ./dev-util/cutter/cutter-1.12.0.ebuild
 1707301237 ./dev-util/cwdiff/cwdiff-0.4.0.ebuild
@@ -15908,14 +15901,13 @@
 2004211009 ./dev-util/dejagnu/dejagnu-1.6.ebuild
 2006290009 ./dev-util/dejagnu/dejagnu-1.6.2.ebuild
 2004032241 ./dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
-2006251539 ./dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild
+2011282039 ./dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
 2008302139 ./dev-util/devhelp/devhelp-3.36.2.ebuild
 2003261841 ./dev-util/dialog/dialog-1.3.20200228.ebuild
 2004011639 ./dev-util/dialog/dialog-1.3.20200327.ebuild
 2006062109 ./dev-util/dialog/dialog-1.3.20170131.ebuild
 2011141839 ./dev-util/diffball/diffball-1.0.1-r2.ebuild
 2011272109 ./dev-util/difffilter/difffilter-0.3.3-r1.ebuild
-2010270239 ./dev-util/diffoscope/diffoscope-161.ebuild
 2011272309 ./dev-util/diffoscope/diffoscope-162.ebuild
 2003261841 ./dev-util/diffstat/diffstat-1.63.ebuild
 2006062109 ./dev-util/diffstat/diffstat-1.60.ebuild
@@ -15936,7 +15928,6 @@
 2002091639 ./dev-util/drone-cli/drone-cli-1.1.4.ebuild
 2007150109 ./dev-util/drone-cli/drone-cli-1.2.1.ebuild
 1811161339 ./dev-util/drone/drone-0.8.9.ebuild
-1702282250 ./dev-util/dropwatch/dropwatch-1.4-r1.ebuild
 1702282250 ./dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild
 2002230040 ./dev-util/duma/duma-2.5.15-r2.ebuild
 2010060839 ./dev-util/dwarves/dwarves-1.17-r1.ebuild
@@ -16064,7 +16055,7 @@
 2005131809 ./dev-util/kubebuilder/kubebuilder-2.3.1.ebuild
 1910052209 ./dev-util/kup/kup-0.3.4-r1.ebuild
 1912131139 ./dev-util/kup/kup-0.3.6.ebuild
-2004032241 ./dev-util/kyua/kyua-0.13-r2.ebuild
+2011281339 ./dev-util/kyua/kyua-0.13-r2.ebuild
 2003261841 ./dev-util/lcov/lcov-1.13-r2.ebuild
 2003261841 ./dev-util/lcov/lcov-1.14.ebuild
 2005011209 ./dev-util/lcov/lcov-1.14_p2.ebuild
@@ -16073,11 +16064,10 @@
 1702282250 ./dev-util/leaktracer/leaktracer-2.4-r3.ebuild
 1702282250 ./dev-util/linklint/linklint-2.3.5.ebuild
 2005071839 ./dev-util/lldb/lldb-9.0.1-r1.ebuild
-2008010139 ./dev-util/lldb/lldb-10.0.0.ebuild
 2010061709 ./dev-util/lldb/lldb-10.0.1.ebuild
-2010150039 ./dev-util/lldb/lldb-11.0.0.9999.ebuild
-2010150039 ./dev-util/lldb/lldb-12.0.0.9999.ebuild
 2011172339 ./dev-util/lldb/lldb-11.0.0.ebuild
+2011291209 ./dev-util/lldb/lldb-11.0.0.9999.ebuild
+2011291209 ./dev-util/lldb/lldb-12.0.0.9999.ebuild
 2002230040 ./dev-util/lockrun/lockrun-20120508-r1.ebuild
 1911050009 ./dev-util/lsuio/lsuio-0.2.0-r1.ebuild
 2006212138 ./dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -16164,14 +16154,13 @@
 2004032241 ./dev-util/patchutils/patchutils-0.3.4.ebuild
 2004211009 ./dev-util/patchutils/patchutils-0.3.3.ebuild
 1706221724 ./dev-util/patdiff/patdiff-0.9.0.ebuild
-1702282250 ./dev-util/peg/peg-0.1.15-r1.ebuild
 1806050608 ./dev-util/peg/peg-0.1.18.ebuild
 2005071839 ./dev-util/perf/perf-5.4.20.ebuild
 2006130209 ./dev-util/perf/perf-5.7-r1.ebuild
 2010282339 ./dev-util/perf/perf-5.8.ebuild
 2011191939 ./dev-util/perf/perf-5.9.9.ebuild
 2009071209 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
-2009241009 ./dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
+2011281109 ./dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
 2007131839 ./dev-util/pkgconf/pkgconf-1.7.2.ebuild
 2011142339 ./dev-util/pkgconf/pkgconf-1.6.3.ebuild
 2011252124 ./dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
@@ -16231,7 +16220,6 @@
 2010091139 ./dev-util/re2c/re2c-2.0.3.ebuild
 2007201209 ./dev-util/rebar-bin/rebar-bin-3.13.2.ebuild
 2007201209 ./dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
-1912071709 ./dev-util/rebar/rebar-2.6.4.ebuild
 2006212039 ./dev-util/rebar/rebar-2.6.4-r1.ebuild
 2003221339 ./dev-util/redo/redo-0.42a.ebuild
 2003221339 ./dev-util/redo/redo-99999.ebuild
@@ -16407,6 +16395,7 @@
 2007211409 ./dev-util/build2/build2-0.13.0.ebuild
 2010130939 ./dev-util/rustup/rustup-1.22.1-r2.ebuild
 2010130939 ./dev-util/rustup/rustup-9999.ebuild
+2011281109 ./dev-util/rustup/rustup-1.23.0.ebuild
 2009170939 ./dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8.ebuild
 2011130339 ./dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
 2010272139 ./dev-util/cargo-audit/cargo-audit-0.13.1.ebuild
@@ -16877,8 +16866,7 @@
 2011130039 ./games-emulation/pcsx2/pcsx2-9999.ebuild
 2006081209 ./games-emulation/pcsxr/pcsxr-1.9.94_p20190306.ebuild
 2006081209 ./games-emulation/pcsxr/pcsxr-9999.ebuild
-2004252339 ./games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
-2004252339 ./games-emulation/ppsspp/ppsspp-9999.ebuild
+2011281209 ./games-emulation/ppsspp/ppsspp-1.10.3.ebuild
 1910111911 ./games-emulation/snes9x/snes9x-1.59.2.ebuild
 2008140009 ./games-emulation/snes9x/snes9x-1.60.ebuild
 2002140109 ./games-emulation/stella/stella-5.1.3.ebuild
@@ -16932,7 +16920,7 @@
 2011230339 ./games-engines/stratagus/stratagus-2.4.3.ebuild
 1707090132 ./games-engines/xzip/xzip-1.8.2-r3.ebuild
 2004101409 ./games-engines/zoom/zoom-1.1.5-r1.ebuild
-2011011939 ./games-engines/dMagnetic/dMagnetic-0.27.ebuild
+2011281509 ./games-engines/dMagnetic/dMagnetic-0.28.ebuild
 2011152309 ./games-fps/alienarena/alienarena-7.66.ebuild
 2011152209 ./games-fps/avp/avp-20150214-r1.ebuild
 1707090132 ./games-fps/blackshades/blackshades-20070723-r1.ebuild
@@ -18356,6 +18344,7 @@
 2011271839 ./mail-client/neomutt/neomutt-20201127.ebuild
 1902052239 ./mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933-r1.ebuild
 2008290709 ./mail-client/roundcube/roundcube-1.4.8.ebuild
+2011282309 ./mail-client/roundcube/roundcube-1.4.9.ebuild
 2011242139 ./mail-client/s-nail/s-nail-14.9.16.ebuild
 2011242139 ./mail-client/s-nail/s-nail-14.9.19.ebuild
 2008111639 ./mail-client/sylpheed/sylpheed-3.7.0-r1.ebuild
@@ -18453,7 +18442,7 @@
 2006081141 ./mail-mta/exim/exim-4.94-r1.ebuild
 2004032241 ./mail-mta/msmtp/msmtp-1.8.7-r1.ebuild
 2011132339 ./mail-mta/msmtp/msmtp-1.8.13.ebuild
-2011272009 ./mail-mta/msmtp/msmtp-1.8.12.ebuild
+2011291139 ./mail-mta/msmtp/msmtp-1.8.12.ebuild
 2008272209 ./mail-mta/netqmail/netqmail-1.06-r14.ebuild
 2003071909 ./mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
 2008252239 ./mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
@@ -19401,7 +19390,7 @@
 2006041239 ./media-libs/libirman/libirman-0.4.5.ebuild
 2010180409 ./media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
 2010180409 ./media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r2.ebuild
-2011180139 ./media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
+2011281909 ./media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
 2007050339 ./media-libs/libjsw/libjsw-1.5.8.ebuild
 2009091409 ./media-libs/libkate/libkate-0.4.1-r4.ebuild
 1912291610 ./media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
@@ -19647,9 +19636,6 @@
 2010091139 ./media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
 2002091409 ./media-libs/sg/sg-1.5.ebuild
 1910111911 ./media-libs/sge/sge-030809.ebuild
-2002101639 ./media-libs/shaderc/shaderc-2018.0.ebuild
-2002270739 ./media-libs/shaderc/shaderc-2019.0-r1.ebuild
-2006180239 ./media-libs/shaderc/shaderc-2020.1.ebuild
 2011030609 ./media-libs/shaderc/shaderc-2020.2.ebuild
 2011072039 ./media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
 2003041939 ./media-libs/simage/simage-1.8.0.ebuild
@@ -20458,8 +20444,8 @@
 2001171239 ./media-sound/helm/helm-0.9.0-r1.ebuild
 1804182208 ./media-sound/herrie/herrie-2.2-r1.ebuild
 2008080239 ./media-sound/horgand/horgand-1.14-r2.ebuild
-2009071109 ./media-sound/hydrogen/hydrogen-9999.ebuild
 2010071039 ./media-sound/hydrogen/hydrogen-1.0.1.ebuild
+2011281309 ./media-sound/hydrogen/hydrogen-9999.ebuild
 1910161509 ./media-sound/icecream/icecream-1.3.ebuild
 1805252109 ./media-sound/id3/id3-0.15-r1.ebuild
 1912111539 ./media-sound/id3ed/id3ed-1.10.4-r1.ebuild
@@ -20808,7 +20794,7 @@
 2009051609 ./media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
 2009051609 ./media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
 1702282250 ./media-tv/w_scan/w_scan-20141122.ebuild
-1901261409 ./media-tv/w_scan/w_scan-20170107.ebuild
+2011290239 ./media-tv/w_scan/w_scan-20170107.ebuild
 1909231039 ./media-tv/xmltv/xmltv-0.5.70.ebuild
 2007051209 ./media-tv/xmltv/xmltv-0.6.1.ebuild
 1910042209 ./media-video/acidrip/acidrip-0.14-r4.ebuild
@@ -20862,8 +20848,8 @@
 1702282250 ./media-video/ffcast/ffcast-2.4.8.ebuild
 2007281739 ./media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
 2007230839 ./media-video/ffmpeg/ffmpeg-4.2.4.ebuild
-2010091209 ./media-video/ffmpeg/ffmpeg-4.3.1.ebuild
 2010222009 ./media-video/ffmpeg/ffmpeg-9999.ebuild
+2011281439 ./media-video/ffmpeg/ffmpeg-4.3.1.ebuild
 2009261609 ./media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
 2004261339 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
 2010141139 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
@@ -20932,7 +20918,7 @@
 1907151840 ./media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
 2007230839 ./media-video/mplayer/mplayer-9999.ebuild
 2011151839 ./media-video/mplayer/mplayer-1.3.0-r6.ebuild
-2011271939 ./media-video/mplayer/mplayer-1.4-r1.ebuild
+2011281239 ./media-video/mplayer/mplayer-1.4-r1.ebuild
 2011202109 ./media-video/mpv/mpv-0.32.0-r2.ebuild
 2011231509 ./media-video/mpv/mpv-0.33.0.ebuild
 2011231509 ./media-video/mpv/mpv-9999.ebuild
@@ -20960,6 +20946,7 @@
 2010080539 ./media-video/pipewire/pipewire-0.3.10.ebuild
 2010111709 ./media-video/pipewire/pipewire-0.3.13.ebuild
 2011132239 ./media-video/pipewire/pipewire-0.3.15.ebuild
+2011281709 ./media-video/pipewire/pipewire-0.3.17.ebuild
 2005121009 ./media-video/pitivi/pitivi-0.999-r3.ebuild
 2005181609 ./media-video/projectx/projectx-0.91.0.10-r2.ebuild
 2004261409 ./media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217-r1.ebuild
@@ -21589,7 +21576,7 @@
 2010142109 ./net-dns/bind/bind-9.16.7.ebuild
 2010302039 ./net-dns/bind/bind-9.16.8.ebuild
 2005260039 ./net-dns/c-ares/c-ares-1.16.1.ebuild
-2011270209 ./net-dns/c-ares/c-ares-1.17.1.ebuild
+2011281539 ./net-dns/c-ares/c-ares-1.17.1.ebuild
 2004291509 ./net-dns/coredns/coredns-1.6.9.ebuild
 2007221109 ./net-dns/coredns/coredns-1.7.0.ebuild
 2010112339 ./net-dns/ddclient/ddclient-3.9.1.ebuild
@@ -21622,11 +21609,11 @@
 2011252124 ./net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild
 2011252124 ./net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild
 2004211009 ./net-dns/idnkit/idnkit-1.0-r2.ebuild
-2011272009 ./net-dns/idnkit/idnkit-2.3.ebuild
+2011291139 ./net-dns/idnkit/idnkit-2.3.ebuild
 2010171709 ./net-dns/knot/knot-2.9.7.ebuild
 2011140309 ./net-dns/knot/knot-3.0.2.ebuild
 2004032241 ./net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
-2011272009 ./net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+2011291139 ./net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
 2011172209 ./net-dns/libidn/libidn-1.36.ebuild
 2006141939 ./net-dns/libidn2/libidn2-2.3.0.ebuild
 2008181439 ./net-dns/maradns/maradns-3.5.0005.ebuild
@@ -21704,7 +21691,7 @@
 2009071209 ./net-firewall/iptables/iptables-1.8.5.ebuild
 2011020309 ./net-firewall/iptables/iptables-1.8.6.ebuild
 1702282250 ./net-firewall/itval/itval-1.2_p20121104.ebuild
-2011272009 ./net-firewall/itval/itval-1.2_p20121104-r1.ebuild
+2011291139 ./net-firewall/itval/itval-1.2_p20121104-r1.ebuild
 2001260341 ./net-firewall/lutelwall/lutelwall-0.99-r1.ebuild
 1805061738 ./net-firewall/nfacct/nfacct-1.0.1.ebuild
 1805061738 ./net-firewall/nfacct/nfacct-1.0.2.ebuild
@@ -21715,8 +21702,8 @@
 2002151310 ./net-firewall/nufw/nufw-2.2.22-r3.ebuild
 2006141358 ./net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild
 1805061738 ./net-firewall/psad/psad-2.4.5.ebuild
-1808071039 ./net-firewall/psad/psad-2.4.6.ebuild
 2002112051 ./net-firewall/psad/psad-2.2.5.ebuild
+2011291139 ./net-firewall/psad/psad-2.4.6.ebuild
 2008081539 ./net-firewall/rtsp-conntrack/rtsp-conntrack-3.7-r2.ebuild
 2008081539 ./net-firewall/rtsp-conntrack/rtsp-conntrack-4.18-r1.ebuild
 2008081739 ./net-firewall/sanewall/sanewall-1.1.6-r3.ebuild
@@ -21785,7 +21772,7 @@
 2004211009 ./net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
 2002180009 ./net-ftp/gftp/gftp-2.0.19-r3.ebuild
 2002230040 ./net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild
-2011272009 ./net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
+2011291139 ./net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
 2011071209 ./net-ftp/lftp/lftp-9999.ebuild
 2011152209 ./net-ftp/lftp/lftp-4.9.2.ebuild
 1702282250 ./net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild
@@ -21835,7 +21822,6 @@
 1907151840 ./net-im/gitter-bin/gitter-bin-3.1.0.ebuild
 1902140139 ./net-im/gitter-bin/gitter-bin-4.1.0.ebuild
 2011122139 ./net-im/jabber-base/jabber-base-0.01-r2.ebuild
-2010230139 ./net-im/kadu/kadu-4.3-r2.ebuild
 1702282250 ./net-im/kouchat/kouchat-1.1.0.ebuild
 2008111739 ./net-im/libcommuni/libcommuni-3.5.0_p20200711.ebuild
 2011142339 ./net-im/librvp/librvp-0.9.7.ebuild
@@ -21891,7 +21877,7 @@
 2010101809 ./net-im/teams/teams-1.3.00.25560.ebuild
 2010121539 ./net-im/zoom/zoom-5.3.472687.1012.ebuild
 2011100139 ./net-im/zoom/zoom-5.4.53391.1108.ebuild
-2011270109 ./net-im/zoom/zoom-5.4.54779.1115-r2.ebuild
+2011281639 ./net-im/zoom/zoom-5.4.54779.1115-r3.ebuild
 2009071209 ./net-im/slack/slack-4.3.2-r2.ebuild
 2009071209 ./net-im/slack/slack-4.4.2.ebuild
 2009071209 ./net-im/slack/slack-4.4.3.ebuild
@@ -21908,7 +21894,7 @@
 2004032241 ./net-irc/eggdrop/eggdrop-1.8.3.ebuild
 2008191339 ./net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild
 1702282250 ./net-irc/emech/emech-3.0.3-r1.ebuild
-2011271909 ./net-irc/emech/emech-3.0.99_p3.ebuild
+2011291139 ./net-irc/emech/emech-3.0.99_p3.ebuild
 2004280809 ./net-irc/epic5/epic5-2.0.1.ebuild
 2001051415 ./net-irc/hexchat/hexchat-9999.ebuild
 2006051039 ./net-irc/hexchat/hexchat-2.14.3.ebuild
@@ -21980,7 +21966,7 @@
 2004032241 ./net-libs/courier-unicode/courier-unicode-2.1.ebuild
 2011232009 ./net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
 2005040939 ./net-libs/cppzmq/cppzmq-0_pre150606.ebuild
-2011272009 ./net-libs/cppzmq/cppzmq-4.6.0.ebuild
+2011291139 ./net-libs/cppzmq/cppzmq-4.6.0.ebuild
 1904281109 ./net-libs/cvm/cvm-0.96-r1.ebuild
 2004081409 ./net-libs/cvm/cvm-0.97.ebuild
 2007231709 ./net-libs/czmq/czmq-4.2.0.ebuild
@@ -22144,7 +22130,7 @@
 2006132027 ./net-libs/libnice/libnice-0.1.13.ebuild
 2006132027 ./net-libs/libnice/libnice-0.1.15.ebuild
 1702282250 ./net-libs/libnids/libnids-1.24-r6.ebuild
-2011272009 ./net-libs/libnids/libnids-1.24-r7.ebuild
+2011291139 ./net-libs/libnids/libnids-1.24-r7.ebuild
 1702282250 ./net-libs/libnipper/libnipper-0.12.6-r1.ebuild
 2004211009 ./net-libs/libnsl/libnsl-0-r1.ebuild
 2009071209 ./net-libs/libnsl/libnsl-1.3.0-r1.ebuild
@@ -22165,7 +22151,7 @@
 2009011309 ./net-libs/libpcap/libpcap-1.10.0_pre.ebuild
 2011140239 ./net-libs/libpcap/libpcap-1.9.1-r3.ebuild
 2002151310 ./net-libs/libpcapnav/libpcapnav-0.8.ebuild
-2011272009 ./net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
+2011291139 ./net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
 2007201539 ./net-libs/libpri/libpri-1.6.0.ebuild
 1904151309 ./net-libs/libprotoident/libprotoident-2.0.13.ebuild
 1904151309 ./net-libs/libprotoident/libprotoident-9999.ebuild
@@ -22200,7 +22186,7 @@
 2010121339 ./net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
 2010270339 ./net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
 2008241239 ./net-libs/libsmi/libsmi-0.4.8-r1.ebuild
-2011272009 ./net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+2011291139 ./net-libs/libsmi/libsmi-0.5.0-r1.ebuild
 2007290809 ./net-libs/libsoup/libsoup-2.70.0.ebuild
 1907151840 ./net-libs/libsrsirc/libsrsirc-0.0.14-r1.ebuild
 2004032241 ./net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
@@ -22239,7 +22225,7 @@
 2006290939 ./net-libs/libvncserver/libvncserver-0.9.13.ebuild
 2001230639 ./net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
 2010070339 ./net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
-2010280039 ./net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
+2011291139 ./net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
 2007190239 ./net-libs/libzapojit/libzapojit-0.0.3.ebuild
 1905290739 ./net-libs/liquid-dsp/liquid-dsp-1.3.0.ebuild
 1905290739 ./net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
@@ -22268,7 +22254,7 @@
 1702282250 ./net-libs/netwib/netwib-5.39.0.ebuild
 2007301909 ./net-libs/nghttp2/nghttp2-9999.ebuild
 2009011309 ./net-libs/nghttp2/nghttp2-1.41.0.ebuild
-2011241339 ./net-libs/nghttp2/nghttp2-1.42.0.ebuild
+2011281539 ./net-libs/nghttp2/nghttp2-1.42.0.ebuild
 2002112051 ./net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
 2002112051 ./net-libs/nghttp3/nghttp3-9999.ebuild
 2002112051 ./net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
@@ -22398,7 +22384,7 @@
 1712171839 ./net-mail/eps/eps-1.7-r1.ebuild
 2002230040 ./net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
 1902161239 ./net-mail/fdm/fdm-1.9.ebuild
-2011272009 ./net-mail/fdm/fdm-2.0.ebuild
+2011291139 ./net-mail/fdm/fdm-2.0.ebuild
 2008292339 ./net-mail/fetchmail/fetchmail-6.4.8.ebuild
 2009030009 ./net-mail/fetchmail/fetchmail-6.4.11.ebuild
 2009160139 ./net-mail/fetchmail/fetchmail-6.4.12.ebuild
@@ -22485,7 +22471,6 @@
 2009192109 ./net-mail/serialmail/serialmail-0.75-r5.ebuild
 1907151840 ./net-mail/signify/signify-1.14.ebuild
 2009132209 ./net-mail/smtptools/smtptools-0.2.3-r1.ebuild
-1912111540 ./net-mail/swaks/swaks-20130209.0-r1.ebuild
 2004261709 ./net-mail/swaks/swaks-20190914.0.ebuild
 2011281009 ./net-mail/swaks/swaks-20201014.0.ebuild
 1909280609 ./net-mail/t-prot/t-prot-3.4.ebuild
@@ -22606,8 +22591,8 @@
 2008061339 ./net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild
 2004282239 ./net-misc/dhcpcd/dhcpcd-8.1.9.ebuild
 2006042139 ./net-misc/dhcpcd/dhcpcd-9999.ebuild
-2011012239 ./net-misc/dhcpcd/dhcpcd-9.3.2.ebuild
 2011201709 ./net-misc/dhcpcd/dhcpcd-9.3.3.ebuild
+2011290009 ./net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
 1702282250 ./net-misc/dhcpd-pools/dhcpd-pools-2.21.ebuild
 1910111911 ./net-misc/dhcping/dhcping-1.2.ebuild
 2007241439 ./net-misc/dibbler/dibbler-1.0.1-r2.ebuild
@@ -22692,7 +22677,7 @@
 2008111739 ./net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild
 2011272009 ./net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild
 2004032241 ./net-misc/ipcalc/ipcalc-0.41.ebuild
-2011272009 ./net-misc/ipcalc/ipcalc-0.42_p2.ebuild
+2011291139 ./net-misc/ipcalc/ipcalc-0.42_p2.ebuild
 1912011439 ./net-misc/iperf/iperf-2.0.13.ebuild
 2002151310 ./net-misc/iperf/iperf-3.6.ebuild
 2006151309 ./net-misc/iperf/iperf-3.7.ebuild
@@ -22701,7 +22686,7 @@
 2008180039 ./net-misc/iperf/iperf-3.9.ebuild
 2008181439 ./net-misc/iperf/iperf-2.0.14a.ebuild
 2008181439 ./net-misc/iperf/iperf-2.99999.99999.ebuild
-2010102239 ./net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
+2011290509 ./net-misc/ipmiview/ipmiview-2.18.0.201007.ebuild
 2011201709 ./net-misc/iprange/iprange-1.0.4.ebuild
 2002081739 ./net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
 1801012010 ./net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild
@@ -22728,8 +22713,8 @@
 2002010209 ./net-misc/kafkacat/kafkacat-1.5.0.ebuild
 2011251239 ./net-misc/kea/kea-1.8.1.ebuild
 2011251239 ./net-misc/kea/kea-9999.ebuild
-2004032241 ./net-misc/keychain/keychain-2.8.5.ebuild
 2004211009 ./net-misc/keychain/keychain-2.8.1.ebuild
+2011291139 ./net-misc/keychain/keychain-2.8.5.ebuild
 2006212208 ./net-misc/knock/knock-0.7-r1.ebuild
 1911050009 ./net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1-r1.ebuild
 1911042209 ./net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild
@@ -22738,7 +22723,7 @@
 1806052039 ./net-misc/lcr/lcr-9999.ebuild
 2002030109 ./net-misc/libteam/libteam-1.22.ebuild
 2007271839 ./net-misc/libteam/libteam-9999.ebuild
-2011272009 ./net-misc/libteam/libteam-1.31.ebuild
+2011291139 ./net-misc/libteam/libteam-1.31.ebuild
 2008291939 ./net-misc/linux-eoip/linux-eoip-0.5.ebuild
 2011051739 ./net-misc/linuxptp/linuxptp-2.0-r1.ebuild
 1910051539 ./net-misc/liveice/liveice-2000530-r2.ebuild
@@ -22762,7 +22747,7 @@
 2008042139 ./net-misc/mikutter/mikutter-4.0.6.ebuild
 2008042139 ./net-misc/mikutter/mikutter-9999.ebuild
 2011252124 ./net-misc/minidlna/minidlna-1.2.1-r1.ebuild
-2011280409 ./net-misc/minidlna/minidlna-1.3.0.ebuild
+2011291139 ./net-misc/minidlna/minidlna-1.3.0.ebuild
 2002230040 ./net-misc/minissdpd/minissdpd-1.5.20190824.ebuild
 2010102139 ./net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
 2005140939 ./net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild
@@ -22791,7 +22776,7 @@
 2004032241 ./net-misc/netifrc/netifrc-0.7.1.ebuild
 2004211009 ./net-misc/netifrc/netifrc-0.5.1.ebuild
 2009071239 ./net-misc/netifrc/netifrc-9999.ebuild
-2011272009 ./net-misc/netifrc/netifrc-0.7.1-r1.ebuild
+2011291139 ./net-misc/netifrc/netifrc-0.7.1-r1.ebuild
 1805091408 ./net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
 1801032209 ./net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild
 2004211009 ./net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
@@ -22830,7 +22815,7 @@
 2005102009 ./net-misc/nyx/nyx-2.1.0-r1.ebuild
 1910052209 ./net-misc/ofono/ofono-1.16.ebuild
 1910210509 ./net-misc/ofono/ofono-1.30.ebuild
-2011272009 ./net-misc/ofono/ofono-1.31.ebuild
+2011291139 ./net-misc/ofono/ofono-1.31.ebuild
 2007171839 ./net-misc/oidentd/oidentd-2.5.0.ebuild
 1811232039 ./net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
 1708300038 ./net-misc/olsrd/olsrd-0.9.6.1.ebuild
@@ -22850,7 +22835,7 @@
 1702282250 ./net-misc/packETH/packETH-1.7.3.ebuild
 1705181135 ./net-misc/packETH/packETH-1.8.1.ebuild
 1712241539 ./net-misc/packETH/packETH-1.9.ebuild
-2011272009 ./net-misc/packETH/packETH-2.1.ebuild
+2011291139 ./net-misc/packETH/packETH-2.1.ebuild
 1904180709 ./net-misc/pcapfix/pcapfix-1.1.4.ebuild
 1806011708 ./net-misc/pedro/pedro-1.6.ebuild
 1905200009 ./net-misc/pen/pen-0.34.1.ebuild
@@ -22858,7 +22843,7 @@
 1810301339 ./net-misc/pingu/pingu-1.5.ebuild
 1810301339 ./net-misc/pingu/pingu-9999.ebuild
 1805061738 ./net-misc/pipes/pipes-1.16.1.ebuild
-2011272009 ./net-misc/pipes/pipes-1.16.1-r1.ebuild
+2011291139 ./net-misc/pipes/pipes-1.16.1-r1.ebuild
 1704031312 ./net-misc/plowshare/plowshare-2.1.6.ebuild
 1708301356 ./net-misc/plowshare/plowshare-2.1.7.ebuild
 1702282250 ./net-misc/plowshare/plowshare-9999.ebuild
@@ -22987,11 +22972,6 @@
 1805290208 ./net-misc/taptap/taptap-1.0.ebuild
 2009150309 ./net-misc/taylor-uucp/taylor-uucp-1.07-r4.ebuild
 2009071139 ./net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
-1912201739 ./net-misc/teamviewer/teamviewer-15.0.8397.ebuild
-1912201739 ./net-misc/teamviewer/teamviewer-15.1.3937.ebuild
-2002061509 ./net-misc/teamviewer/teamviewer-15.2.2756.ebuild
-2003161309 ./net-misc/teamviewer/teamviewer-15.3.2682.ebuild
-2003271339 ./net-misc/teamviewer/teamviewer-15.4.4445.ebuild
 2011251739 ./net-misc/teamviewer/teamviewer-15.5.3.ebuild
 2004211009 ./net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
 2002112051 ./net-misc/throttle/throttle-1.2-r1.ebuild
@@ -23005,14 +22985,13 @@
 1702282250 ./net-misc/ucarp/ucarp-1.5.2-r5.ebuild
 1702282250 ./net-misc/udpcast/udpcast-20120424-r1.ebuild
 1702282250 ./net-misc/udpcast/udpcast-20120424.ebuild
-2011272009 ./net-misc/udpcast/udpcast-20200328.ebuild
+2011291139 ./net-misc/udpcast/udpcast-20200328.ebuild
 1708061641 ./net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild
 2002071739 ./net-misc/uftp/uftp-4.10.1.ebuild
 2010201409 ./net-misc/unison/unison-2.48.15_p4-r2.ebuild
 2011271939 ./net-misc/unison/unison-2.51.3_p20201024.ebuild
 2004032241 ./net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild
-2002151310 ./net-misc/usbip/usbip-3.19.ebuild
-2002151310 ./net-misc/usbip/usbip-4.13.ebuild
+2011290239 ./net-misc/usbip/usbip-4.13-r1.ebuild
 2003072009 ./net-misc/utelnetd/utelnetd-0.1.11-r2.ebuild
 1912110241 ./net-misc/valve/valve-1.0-r1.ebuild
 1910181540 ./net-misc/vconfig/vconfig-1.9.ebuild
@@ -23027,7 +23006,7 @@
 2009150209 ./net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
 1907151840 ./net-misc/vrrpd/vrrpd-1.9.ebuild
 1910111911 ./net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
-2011272009 ./net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
+2011291139 ./net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
 2007231439 ./net-misc/wget/wget-1.20.3-r1.ebuild
 2007242209 ./net-misc/wget/wget-1.20.3-r3.ebuild
 2001272009 ./net-misc/whatmask/whatmask-1.2-r1.ebuild
@@ -23046,8 +23025,9 @@
 2004261409 ./net-misc/you-get/you-get-0.4.1355-r1.ebuild
 2009041739 ./net-misc/you-get/you-get-0.4.1432.ebuild
 2009220939 ./net-misc/youtube-dl/youtube-dl-2020.09.20.ebuild
-2011280339 ./net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
-2011280339 ./net-misc/youtube-dl/youtube-dl-99999999.ebuild
+2011281339 ./net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
+2011291139 ./net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild
+2011291139 ./net-misc/youtube-dl/youtube-dl-9999.ebuild
 2011260709 ./net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild
 2011260709 ./net-misc/youtube-viewer/youtube-viewer-9999.ebuild
 1904210639 ./net-misc/zerotier/zerotier-1.2.12.ebuild
@@ -23104,8 +23084,6 @@
 2008310709 ./net-news/rsstail/rsstail-2.1.ebuild
 2008310709 ./net-news/rsstail/rsstail-2.1_p20200310.ebuild
 1910111911 ./net-news/rsstool/rsstool-1.0.1_rc2.ebuild
-2007212309 ./net-news/snownews/snownews-1.5.12-r1.ebuild
-2007212309 ./net-news/snownews/snownews-1.5.13.ebuild
 2007212309 ./net-news/snownews/snownews-1.6.10.ebuild
 2002112051 ./net-news/yydecode/yydecode-0.2.10-r1.ebuild
 2009130709 ./net-nntp/brag/brag-1.4.3.ebuild
@@ -23121,7 +23099,6 @@
 2009020009 ./net-nntp/sabnzbd/sabnzbd-3.0.2.ebuild
 2010200039 ./net-nntp/sabnzbd/sabnzbd-3.1.0.ebuild
 2011121839 ./net-nntp/sabnzbd/sabnzbd-3.1.1.ebuild
-1712210209 ./net-nntp/slrn/slrn-1.0.2.ebuild
 1909180009 ./net-nntp/slrn/slrn-1.0.3.ebuild
 1810141609 ./net-nntp/suck/suck-4.3.3-r1.ebuild
 2004281139 ./net-nntp/suck/suck-4.3.4.ebuild
@@ -23175,7 +23152,7 @@
 2010270439 ./net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
 1806172339 ./net-p2p/litecoind/litecoind-0.10.4.0.ebuild
 2001061409 ./net-p2p/mktorrent/mktorrent-1.0-r1.ebuild
-2002112051 ./net-p2p/mktorrent/mktorrent-1.1_p20180912.ebuild
+2011291139 ./net-p2p/mktorrent/mktorrent-1.1_p20180912.ebuild
 2011080009 ./net-p2p/mldonkey/mldonkey-3.1.7.ebuild
 2011021509 ./net-p2p/ncdc/ncdc-1.21.ebuild
 2011021509 ./net-p2p/ncdc/ncdc-1.22.1.ebuild
@@ -23198,7 +23175,7 @@
 1805290208 ./net-p2p/syrep/syrep-0.9.ebuild
 2009050309 ./net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
 1706221547 ./net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.3.1.ebuild
-2003202339 ./net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
+2011281639 ./net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
 2005261909 ./net-p2p/transmission/transmission-9999.ebuild
 2006071209 ./net-p2p/transmission/transmission-3.00-r1.ebuild
 1806011708 ./net-p2p/tvrss/tvrss-1.8_beta.ebuild
@@ -23228,8 +23205,7 @@
 2010020309 ./net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
 1911261539 ./net-print/brlaser/brlaser-4.ebuild
 2006300939 ./net-print/brlaser/brlaser-6.ebuild
-1702282250 ./net-print/c2esp/c2esp-26.ebuild
-1808280009 ./net-print/c2esp/c2esp-27.ebuild
+2011290239 ./net-print/c2esp/c2esp-27.ebuild
 1912111540 ./net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
 1912111540 ./net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
 1905270009 ./net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
@@ -23277,7 +23253,6 @@
 1702282250 ./net-print/ink/ink-0.5.2.ebuild
 1801132309 ./net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild
 1912111540 ./net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild
-2004032241 ./net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
 2006132027 ./net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
 2002230040 ./net-print/libinklevel/libinklevel-0.9.2.ebuild
 1702282250 ./net-print/lm1100/lm1100-1.0.2a-r1.ebuild
@@ -23317,14 +23292,12 @@
 2011061239 ./net-proxy/haproxy/haproxy-2.1.10.ebuild
 2011061239 ./net-proxy/haproxy/haproxy-2.3.9999.ebuild
 2011161139 ./net-proxy/haproxy/haproxy-2.3.1.ebuild
-2011271939 ./net-proxy/haproxy/haproxy-2.2.5.ebuild
+2011291139 ./net-proxy/haproxy/haproxy-2.2.5.ebuild
 2011041509 ./net-proxy/hatop/hatop-0.8.0.ebuild
 1702282250 ./net-proxy/havp/havp-0.92a-r2.ebuild
 2008020739 ./net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
 2010091039 ./net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild
 2011090239 ./net-proxy/mitmproxy/mitmproxy-5.3.0.ebuild
-1912111540 ./net-proxy/nutcracker/nutcracker-0.2.4.ebuild
-1912111540 ./net-proxy/nutcracker/nutcracker-0.3.0.ebuild
 1912111540 ./net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
 2007181509 ./net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild
 2003261841 ./net-proxy/pingtunnel/pingtunnel-0.72.ebuild
@@ -23357,7 +23330,7 @@
 1910111911 ./net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
 2002112051 ./net-proxy/tsocks/tsocks-1.8_beta5-r8.ebuild
 1712281839 ./net-proxy/wwwoffle/wwwoffle-2.9i-r1.ebuild
-1908281139 ./net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
+2011290239 ./net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
 2008060039 ./net-proxy/microsocks/microsocks-1.0.1_p20200805.ebuild
 2009191539 ./net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r2.ebuild
 2009270939 ./net-voip/telepathy-rakia/telepathy-rakia-0.8.0-r1.ebuild
@@ -23422,7 +23395,6 @@
 2009061309 ./net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild
 1703171656 ./net-vpn/vpncwatch/vpncwatch-1.8.1.ebuild
 1908230109 ./net-vpn/vtun/vtun-3.0.3-r1.ebuild
-1703171738 ./net-vpn/vtun/vtun-3.0.3.ebuild
 2011182309 ./net-vpn/wireguard-modules/wireguard-modules-1.0.20201112.ebuild
 2008061839 ./net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
 2009081939 ./net-vpn/wireguard-tools/wireguard-tools-1.0.20200827.ebuild
@@ -24005,7 +23977,7 @@
 1910111911 ./sci-calculators/galculator/galculator-2.1.4.ebuild
 2011222039 ./sci-calculators/galculator/galculator-2.1.4-r1.ebuild
 1702282250 ./sci-calculators/grpn/grpn-1.4.0.ebuild
-1909152040 ./sci-calculators/hcalc/hcalc-1.2-r1.ebuild
+2011290239 ./sci-calculators/hcalc/hcalc-1.2-r1.ebuild
 1910051539 ./sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild
 2010261709 ./sci-calculators/keurocalc/keurocalc-1.3.0.ebuild
 1702282250 ./sci-calculators/orpie/orpie-1.5.2-r1.ebuild
@@ -24087,7 +24059,7 @@
 2011220039 ./sci-chemistry/procheck/procheck-3.5.4-r3.ebuild
 2007010239 ./sci-chemistry/propka/propka-3.2.0.ebuild
 2008291539 ./sci-chemistry/psi/psi-3.4.0-r2.ebuild
-2011271709 ./sci-chemistry/pymol/pymol-2.4.0.ebuild
+2011282309 ./sci-chemistry/pymol/pymol-2.4.0.ebuild
 2002230040 ./sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
 2009170109 ./sci-chemistry/raster3d/raster3d-3.0.6.ebuild
 2009162339 ./sci-chemistry/suitename/suitename-0.3.070628.ebuild
@@ -24216,7 +24188,7 @@
 2008301039 ./sci-electronics/xnec2c/xnec2c-3.5.1.ebuild
 2010071039 ./sci-electronics/xnec2c/xnec2c-4.1.1.ebuild
 1702282250 ./sci-electronics/xoscope/xoscope-2.0.ebuild
-1702282250 ./sci-electronics/xoscope/xoscope-2.1.ebuild
+2011290239 ./sci-electronics/xoscope/xoscope-2.2.ebuild
 2009210209 ./sci-electronics/ktechlab/ktechlab-0.50.0.ebuild
 1806091739 ./sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
 1806091739 ./sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
@@ -24236,6 +24208,7 @@
 2006040939 ./sci-geosciences/gpxsee/gpxsee-7.29.ebuild
 2010301909 ./sci-geosciences/gpxsee/gpxsee-7.35.ebuild
 2011171209 ./sci-geosciences/gpxsee/gpxsee-7.36.ebuild
+2011281739 ./sci-geosciences/gpxsee/gpxsee-7.37.ebuild
 1805212239 ./sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
 1805212239 ./sci-geosciences/gshhs/gshhs-1.13.ebuild
 1910261809 ./sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
@@ -24309,7 +24282,7 @@
 2011210009 ./sci-geosciences/qgis/qgis-9999.ebuild
 2011240139 ./sci-geosciences/qgis/qgis-3.16.1.ebuild
 2002031839 ./sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild
-2006221809 ./sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild
+2011281609 ./sci-geosciences/qmapshack/qmapshack-1.15.1.ebuild
 1702282250 ./sci-geosciences/readosm/readosm-1.0.0e-r1.ebuild
 1710241324 ./sci-geosciences/routino/routino-3.1.1.ebuild
 1810021809 ./sci-geosciences/routino/routino-3.2.ebuild
@@ -24674,7 +24647,7 @@
 2009252139 ./sci-libs/tensorflow/tensorflow-2.2.0-r2.ebuild
 2010090709 ./sci-libs/tensorflow/tensorflow-2.3.1.ebuild
 2010200339 ./sci-libs/tensorflow/tensorflow-2.3.1-r1.ebuild
-2011120409 ./sci-libs/tensorflow/tensorflow-2.4.0_rc1.ebuild
+2011290209 ./sci-libs/tensorflow/tensorflow-2.4.0_rc3.ebuild
 2006111539 ./sci-libs/tnt/tnt-3.0.12.ebuild
 1908130939 ./sci-libs/trilinos/trilinos-12.14.1.ebuild
 2006102109 ./sci-libs/trilinos/trilinos-12.18.1.ebuild
@@ -24889,8 +24862,6 @@
 1908270609 ./sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
 1702282250 ./sci-misc/h5utils/h5utils-1.12.1-r2.ebuild
 1802192308 ./sci-misc/lttoolbox/lttoolbox-3.3.3.ebuild
-2001220209 ./sci-misc/mendeleydesktop/mendeleydesktop-1.19.4.ebuild
-2005241209 ./sci-misc/mendeleydesktop/mendeleydesktop-1.19.5.ebuild
 2005241409 ./sci-misc/mendeleydesktop/mendeleydesktop-1.19.6.ebuild
 1912110241 ./sci-misc/nco/nco-4.5.1-r2.ebuild
 1702282250 ./sci-misc/ncview/ncview-2.1.7.ebuild
@@ -25010,6 +24981,7 @@
 2009181339 ./sci-visualization/tensorboard/tensorboard-2.2.1.ebuild
 2009251539 ./sci-visualization/tensorboard/tensorboard-2.2.1-r1.ebuild
 2010090709 ./sci-visualization/tensorboard/tensorboard-2.3.0.ebuild
+2011290209 ./sci-visualization/tensorboard/tensorboard-2.4.0.ebuild
 2009180209 ./sci-visualization/veusz/veusz-3.1.ebuild
 2010141409 ./sci-visualization/veusz/veusz-3.2.ebuild
 1702282250 ./sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild
@@ -26372,7 +26344,7 @@
 2004032241 ./sys-apps/mlocate/mlocate-0.26-r2.ebuild
 2004121939 ./sys-apps/mlocate/mlocate-0.26-r3.ebuild
 2006100439 ./sys-apps/moreutils/moreutils-0.63.ebuild
-2010071039 ./sys-apps/moreutils/moreutils-0.64.ebuild
+2011281239 ./sys-apps/moreutils/moreutils-0.64.ebuild
 1910111911 ./sys-apps/most/most-5.1.0.ebuild
 2002112051 ./sys-apps/most/most-5.0.0a-r1.ebuild
 1702282250 ./sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild
@@ -26427,8 +26399,8 @@
 2007121939 ./sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild
 2007121939 ./sys-apps/pcsc-tools/pcsc-tools-1.5.7.ebuild
 2002140110 ./sys-apps/pick/pick-3.0.1.ebuild
-2011061444 ./sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
 2011222239 ./sys-apps/pkgcore/pkgcore-9999.ebuild
+2011281109 ./sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
 1702282250 ./sys-apps/pmount-gui/pmount-gui-0_pre20130806.ebuild
 2004032241 ./sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
 2010281939 ./sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
@@ -26442,6 +26414,7 @@
 2011070209 ./sys-apps/portage/portage-3.0.8.ebuild
 2011190109 ./sys-apps/portage/portage-3.0.9.ebuild
 2011222309 ./sys-apps/portage/portage-3.0.10-r1.ebuild
+2011290039 ./sys-apps/portage/portage-3.0.11.ebuild
 2010142339 ./sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild
 2005281139 ./sys-apps/prctl/prctl-1.6-r1.ebuild
 2009170039 ./sys-apps/preload/preload-0.6.4-r3.ebuild
@@ -26641,7 +26614,7 @@
 2010102209 ./sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
 2011130339 ./sys-apps/flatpak/flatpak-1.8.2.ebuild
 2011280039 ./sys-apps/flatpak/flatpak-1.9.2.ebuild
-2011230309 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+2011281439 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
 2002092009 ./sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
 2002092009 ./sys-auth/authenticator/authenticator-9999.ebuild
 1912100909 ./sys-auth/docker_auth/docker_auth-1.3.1.ebuild
@@ -26939,7 +26912,7 @@
 2006041239 ./sys-cluster/galera/galera-26.4.3.ebuild
 2009111509 ./sys-cluster/galera/galera-26.4.5.ebuild
 2011140339 ./sys-cluster/galera/galera-26.4.4.ebuild
-2011251939 ./sys-cluster/galera/galera-26.4.6.ebuild
+2011281239 ./sys-cluster/galera/galera-26.4.6.ebuild
 1905311709 ./sys-cluster/ganglia-web/ganglia-web-3.7.3-r1.ebuild
 1912111540 ./sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild
 2010091209 ./sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild
@@ -27199,27 +27172,23 @@
 2008231139 ./sys-devel/bmake/bmake-20200318.ebuild
 2004032241 ./sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
 2003092139 ./sys-devel/clang-common/clang-common-9.0.1.ebuild
-2006232139 ./sys-devel/clang-common/clang-common-11.0.0.9999.ebuild
-2007152209 ./sys-devel/clang-common/clang-common-12.0.0.9999.ebuild
-2008010139 ./sys-devel/clang-common/clang-common-10.0.0.ebuild
 2010110939 ./sys-devel/clang-common/clang-common-10.0.1.ebuild
 2011172339 ./sys-devel/clang-common/clang-common-11.0.0.ebuild
+2011291209 ./sys-devel/clang-common/clang-common-11.0.0.9999.ebuild
+2011291209 ./sys-devel/clang-common/clang-common-12.0.0.9999.ebuild
 2001182039 ./sys-devel/clang-runtime/clang-runtime-11.0.0.9999.ebuild
 2003092139 ./sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
 2007152209 ./sys-devel/clang-runtime/clang-runtime-12.0.0.9999.ebuild
-2008010139 ./sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
 2010110939 ./sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild
 2011172339 ./sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild
 2005072109 ./sys-devel/clang/clang-9.0.1.ebuild
-2008010139 ./sys-devel/clang/clang-10.0.0.ebuild
-2010262009 ./sys-devel/clang/clang-11.0.0.9999.ebuild
 2011151839 ./sys-devel/clang/clang-10.0.1.ebuild
 2011172339 ./sys-devel/clang/clang-11.0.0.ebuild
-2011171239 ./sys-devel/clang/clang-12.0.0.9999.ebuild
+2011291209 ./sys-devel/clang/clang-11.0.0.9999.ebuild
+2011291209 ./sys-devel/clang/clang-12.0.0.9999.ebuild
 1910071309 ./sys-devel/cons/cons-2.3.0.ebuild
 2003261841 ./sys-devel/crossdev/crossdev-99999999.ebuild
 2009041339 ./sys-devel/crossdev/crossdev-20200801.ebuild
-2011090239 ./sys-devel/crossdev/crossdev-20201108.ebuild
 2011230039 ./sys-devel/crossdev/crossdev-20201122.ebuild
 1803112309 ./sys-devel/ct-ng/ct-ng-1.23.0.ebuild
 2002112051 ./sys-devel/ct-ng/ct-ng-1.24.0.ebuild
@@ -27263,26 +27232,24 @@
 2003261841 ./sys-devel/libtool/libtool-9999.ebuild
 2004211009 ./sys-devel/libtool/libtool-2.4.6-r6.ebuild
 2003092139 ./sys-devel/lld/lld-9.0.1.ebuild
-2008010139 ./sys-devel/lld/lld-10.0.0.ebuild
 2010110939 ./sys-devel/lld/lld-10.0.1.ebuild
-2010150039 ./sys-devel/lld/lld-11.0.0.9999.ebuild
-2010150039 ./sys-devel/lld/lld-12.0.0.9999.ebuild
 2011172339 ./sys-devel/lld/lld-11.0.0.ebuild
+2011291209 ./sys-devel/lld/lld-11.0.0.9999.ebuild
+2011291209 ./sys-devel/lld/lld-12.0.0.9999.ebuild
 2003092139 ./sys-devel/llvm-common/llvm-common-9.0.1.ebuild
-2006232139 ./sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild
-2007152209 ./sys-devel/llvm-common/llvm-common-12.0.0.9999.ebuild
-2008010139 ./sys-devel/llvm-common/llvm-common-10.0.0.ebuild
 2010110939 ./sys-devel/llvm-common/llvm-common-10.0.1.ebuild
 2011172339 ./sys-devel/llvm-common/llvm-common-11.0.0.ebuild
+2011291209 ./sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild
+2011291209 ./sys-devel/llvm-common/llvm-common-12.0.0.9999.ebuild
 2009082109 ./sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild
 2009271639 ./sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild
 2011182109 ./sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild
 2005062039 ./sys-devel/llvm/llvm-9.0.1.ebuild
-2008010139 ./sys-devel/llvm/llvm-10.0.0.ebuild
 2010262009 ./sys-devel/llvm/llvm-10.0.1.ebuild
-2010262009 ./sys-devel/llvm/llvm-11.0.0.9999.ebuild
 2011172339 ./sys-devel/llvm/llvm-11.0.0.ebuild
-2011171239 ./sys-devel/llvm/llvm-12.0.0.9999.ebuild
+2011291209 ./sys-devel/llvm/llvm-10.0.0.ebuild
+2011291209 ./sys-devel/llvm/llvm-11.0.0.9999.ebuild
+2011291209 ./sys-devel/llvm/llvm-12.0.0.9999.ebuild
 2006040739 ./sys-devel/llvmgold/llvmgold-9.ebuild
 2007152209 ./sys-devel/llvmgold/llvmgold-12.ebuild
 2008010139 ./sys-devel/llvmgold/llvmgold-10.ebuild
@@ -27315,7 +27282,7 @@
 1804230338 ./sys-fabric/dapl/dapl-2.0.40.ebuild
 1804230338 ./sys-fabric/ibacm/ibacm-1.0.8.ebuild
 2011142339 ./sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild
-1804230338 ./sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
+2011290239 ./sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
 2011142339 ./sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild
 2011142339 ./sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
 1804230338 ./sys-fabric/libehca/libehca-1.2.2-r3.ebuild
@@ -27527,6 +27494,7 @@
 2010280739 ./sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
 2007171039 ./sys-fs/mtools/mtools-4.0.24.ebuild
 2010261239 ./sys-fs/mtools/mtools-4.0.25.ebuild
+2011281939 ./sys-fs/mtools/mtools-4.0.26.ebuild
 1911101539 ./sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
 2005111509 ./sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild
 2008200209 ./sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
@@ -27614,6 +27582,7 @@
 2011252212 ./sys-fs/zfs/zfs-9999.ebuild
 2010061709 ./sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.2.ebuild
 2011070339 ./sys-fs/fuse-overlayfs/fuse-overlayfs-1.2.0.ebuild
+2011282339 ./sys-fs/fuse-overlayfs/fuse-overlayfs-1.3.0.ebuild
 2003081409 ./sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
 2003080009 ./sys-fs/mergerfs/mergerfs-2.29.0.ebuild
 2010042039 ./sys-fs/mergerfs/mergerfs-2.31.0.ebuild
@@ -27705,11 +27674,11 @@
 2011230009 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.79.ebuild
 2011230009 ./sys-kernel/gentoo-sources/gentoo-sources-5.9.10.ebuild
 2011242039 ./sys-kernel/gentoo-sources/gentoo-sources-5.9.11.ebuild
-2011271939 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.209.ebuild
-2011271939 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.160.ebuild
-2011271939 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.246.ebuild
-2011271939 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.246.ebuild
-2011271939 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.80-r1.ebuild
+2011281239 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.209.ebuild
+2011281239 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.160.ebuild
+2011281239 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.246.ebuild
+2011281239 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.246.ebuild
+2011281239 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.80-r1.ebuild
 2010261209 ./sys-kernel/git-sources/git-sources-5.10_rc1.ebuild
 2011021809 ./sys-kernel/git-sources/git-sources-5.10_rc2.ebuild
 2011091109 ./sys-kernel/git-sources/git-sources-5.10_rc3.ebuild
@@ -27834,17 +27803,15 @@
 2011141239 ./sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
 2011162009 ./sys-libs/binutils-libs/binutils-libs-2.35.1-r1.ebuild
 2003092139 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.ebuild
-2008010139 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
 2010110939 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild
-2010150039 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
-2010150039 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
 2011172339 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild
+2011291209 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
+2011291209 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
 2003092139 ./sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
-2008010139 ./sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
 2010110939 ./sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
-2010150039 ./sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
-2010150039 ./sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
 2011172339 ./sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
+2011291209 ./sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
+2011291209 ./sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
 2005072109 ./sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
 2005072109 ./sys-libs/cracklib/cracklib-2.9.7.ebuild
 1912111540 ./sys-libs/csu/csu-79.ebuild
@@ -27919,17 +27886,15 @@
 2011050139 ./sys-libs/libcap/libcap-2.45.ebuild
 2008291639 ./sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
 2005060109 ./sys-libs/libcxx/libcxx-9.0.1.ebuild
-2008010139 ./sys-libs/libcxx/libcxx-10.0.0.ebuild
 2010061709 ./sys-libs/libcxx/libcxx-10.0.1.ebuild
-2010150039 ./sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
-2010150039 ./sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
 2011172339 ./sys-libs/libcxx/libcxx-11.0.0.ebuild
+2011291209 ./sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
+2011291209 ./sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
 2003092139 ./sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
-2007291439 ./sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
-2007291439 ./sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
-2008010139 ./sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
 2010061709 ./sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
 2011172339 ./sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
+2011291209 ./sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
+2011291209 ./sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
 2003030309 ./sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
 2003162339 ./sys-libs/libfaketime/libfaketime-0.9.7.ebuild
 2006140039 ./sys-libs/libfaketime/libfaketime-0.9.8.ebuild
@@ -27942,11 +27907,10 @@
 2004032241 ./sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
 2010260309 ./sys-libs/libnih/libnih-1.0.3-r4.ebuild
 2006132027 ./sys-libs/libomp/libomp-9.0.1.ebuild
-2006232139 ./sys-libs/libomp/libomp-11.0.0.9999.ebuild
-2008010139 ./sys-libs/libomp/libomp-10.0.0.ebuild
 2010110939 ./sys-libs/libomp/libomp-10.0.1.ebuild
-2011011209 ./sys-libs/libomp/libomp-12.0.0.9999.ebuild
 2011172339 ./sys-libs/libomp/libomp-11.0.0.ebuild
+2011291209 ./sys-libs/libomp/libomp-11.0.0.9999.ebuild
+2011291209 ./sys-libs/libomp/libomp-12.0.0.9999.ebuild
 2008302139 ./sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild
 2004032241 ./sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
 2011111109 ./sys-libs/librtas/librtas-2.0.2-r1.ebuild
@@ -27983,13 +27947,12 @@
 2002230040 ./sys-libs/libvpd/libvpd-2.2.6.ebuild
 2011111109 ./sys-libs/libvpd/libvpd-2.2.8.ebuild
 2008051739 ./sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
-2010241409 ./sys-libs/libxcrypt/libxcrypt-4.4.17.ebuild
+2011281439 ./sys-libs/libxcrypt/libxcrypt-4.4.17.ebuild
 2003092139 ./sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild
-2007291439 ./sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
-2007291439 ./sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
-2008010139 ./sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
 2010061709 ./sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.ebuild
 2011172339 ./sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild
+2011291209 ./sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
+2011291209 ./sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
 2004032241 ./sys-libs/lwp/lwp-2.8.ebuild
 2004032241 ./sys-libs/mtdev/mtdev-1.1.6.ebuild
 2002191739 ./sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild
@@ -28031,7 +27994,7 @@
 2006280009 ./sys-libs/tdb/tdb-1.4.3.ebuild
 2006132027 ./sys-libs/tevent/tevent-0.10.2.ebuild
 2008021839 ./sys-libs/timezone-data/timezone-data-2020a.ebuild
-2010291109 ./sys-libs/timezone-data/timezone-data-2020d.ebuild
+2011281639 ./sys-libs/timezone-data/timezone-data-2020d.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -28155,7 +28118,7 @@
 1912290039 ./sys-process/numad/numad-9999.ebuild
 2011040409 ./sys-process/parallel/parallel-20200922.ebuild
 2011040509 ./sys-process/parallel/parallel-20201022.ebuild
-2011240439 ./sys-process/parallel/parallel-20201122.ebuild
+2011281209 ./sys-process/parallel/parallel-20201122.ebuild
 1907151840 ./sys-process/pkill-darwin/pkill-darwin-1.0.ebuild
 2003221439 ./sys-process/prll/prll-0.6.4.ebuild
 1908150239 ./sys-process/procenv/procenv-0.51.ebuild
@@ -28321,7 +28284,7 @@
 2008020039 ./virtual/perl-Filter-Simple/perl-Filter-Simple-0.960.0.ebuild
 2004211009 ./virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r2.ebuild
 2008042009 ./virtual/perl-Getopt-Long/perl-Getopt-Long-2.510.0.ebuild
-2008171009 ./virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r1.ebuild
+2011281239 ./virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r1.ebuild
 2004211009 ./virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r2.ebuild
 2008042009 ./virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.440.0.ebuild
 2004211009 ./virtual/perl-IO-Compress/perl-IO-Compress-2.84.0.ebuild
@@ -28430,7 +28393,7 @@
 2011072109 ./virtual/szip/szip-2.1.ebuild
 2004211009 ./virtual/tex-base/tex-base-0.ebuild
 2004211009 ./virtual/texi2dvi/texi2dvi-0-r2.ebuild
-2010291009 ./virtual/tmpfiles/tmpfiles-0.ebuild
+2011282239 ./virtual/tmpfiles/tmpfiles-0.ebuild
 2004032241 ./virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
 2011172209 ./virtual/udev/udev-217-r2.ebuild
 2004032241 ./virtual/w3m/w3m-0.ebuild
@@ -28645,7 +28608,7 @@
 2011252309 ./www-client/firefox-bin/firefox-bin-78.5.0.ebuild
 2011252309 ./www-client/firefox-bin/firefox-bin-83.0.ebuild
 2011252309 ./www-client/firefox/firefox-78.5.0.ebuild
-2011260139 ./www-client/firefox/firefox-83.0.ebuild
+2011281709 ./www-client/firefox/firefox-83.0.ebuild
 2011172039 ./www-client/google-chrome-beta/google-chrome-beta-87.0.4280.66.ebuild
 2011200109 ./www-client/google-chrome-unstable/google-chrome-unstable-88.0.4324.11.ebuild
 2011172309 ./www-client/google-chrome/google-chrome-87.0.4280.66.ebuild
@@ -28748,10 +28711,11 @@
 1811051209 ./www-servers/civetweb/civetweb-1.11.ebuild
 2007270339 ./www-servers/civetweb/civetweb-1.12.ebuild
 2002230040 ./www-servers/fnord/fnord-1.11-r1.ebuild
-2011271709 ./www-servers/gatling/gatling-0.15.ebuild
+2011282309 ./www-servers/gatling/gatling-0.15.ebuild
+2011290009 ./www-servers/gatling/gatling-0.16.ebuild
 2002111539 ./www-servers/gunicorn/gunicorn-19.8.1.ebuild
 2006121909 ./www-servers/gunicorn/gunicorn-19.9.0.ebuild
-2011262239 ./www-servers/gunicorn/gunicorn-20.0.4.ebuild
+2011281839 ./www-servers/gunicorn/gunicorn-20.0.4.ebuild
 2009201139 ./www-servers/h2o/h2o-2.2.6.ebuild
 2009201139 ./www-servers/h2o/h2o-9999.ebuild
 2010121239 ./www-servers/lighttpd/lighttpd-1.4.55-r1.ebuild
@@ -28777,7 +28741,7 @@
 2005241709 ./www-servers/servefile/servefile-0.4.4_p20200211.ebuild
 2009300409 ./www-servers/servefile/servefile-0.5.1.ebuild
 1708221206 ./www-servers/sniproxy/sniproxy-0.5.0.ebuild
-1912110241 ./www-servers/sniproxy/sniproxy-0.6.0.ebuild
+2011290239 ./www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild
 2006041239 ./www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
 2002230040 ./www-servers/thttpd/thttpd-2.27.1.ebuild
 2002230040 ./www-servers/thttpd/thttpd-9999.ebuild
@@ -28788,7 +28752,7 @@
 2011241339 ./www-servers/tomcat/tomcat-8.5.60.ebuild
 2011241339 ./www-servers/tomcat/tomcat-9.0.40.ebuild
 2004032241 ./www-servers/tornado/tornado-4.5.3.ebuild
-2007120209 ./www-servers/tornado/tornado-6.0.4.ebuild
+2011281509 ./www-servers/tornado/tornado-6.0.4.ebuild
 2010062009 ./www-servers/uwsgi/uwsgi-2.0.19.1.ebuild
 2004201809 ./www-servers/varnish/varnish-6.4.0.ebuild
 2004270309 ./www-servers/varnish/varnish-6.0.6.ebuild
@@ -29261,7 +29225,7 @@
 2001061909 ./x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
 2002112051 ./x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
 2006081939 ./x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
-2011272009 ./x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
+2011291139 ./x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
 1811061009 ./x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.4.ebuild
 2004050839 ./x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.4.0.ebuild
 2010111009 ./x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
@@ -29540,7 +29504,6 @@
 2002112051 ./x11-misc/xsnow/xsnow-1.42-r2.ebuild
 2009041609 ./x11-misc/xsnow/xsnow-3.0.7.ebuild
 1710281306 ./x11-misc/xsr/xsr-1.0.0.ebuild
-1910111911 ./x11-misc/xsri/xsri-2.1.0-r3.ebuild
 2011271209 ./x11-misc/xsri/xsri-2.1.0_p17_p12.ebuild
 1702282250 ./x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild
 1805220439 ./x11-misc/xssstate/xssstate-1.1.ebuild
@@ -29670,6 +29633,7 @@
 2001252039 ./x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0.ebuild
 1702282250 ./x11-plugins/pidgin-skypeweb/pidgin-skypeweb-9999.ebuild
 2002230040 ./x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.5.ebuild
+2011281239 ./x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.7.ebuild
 2009170039 ./x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
 1909152040 ./x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
 1804031238 ./x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
@@ -29825,7 +29789,7 @@
 2009252339 ./x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
 2011101639 ./x11-terms/mlterm/mlterm-3.9.1.ebuild
 2011142339 ./x11-terms/mlterm/mlterm-3.9.0.ebuild
-2009010409 ./x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+2011290239 ./x11-terms/mrxvt/mrxvt-0.5.4.ebuild
 1802161308 ./x11-terms/pangoterm/pangoterm-0.0_pre20171111.ebuild
 2005210239 ./x11-terms/qterminal/qterminal-0.14.1-r1.ebuild
 2008171039 ./x11-terms/qterminal/qterminal-0.15.0.ebuild
@@ -29858,7 +29822,7 @@
 2007142239 ./x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
 2002230040 ./x11-themes/adapta-gtk-theme/adapta-gtk-theme-3.95.0.11.ebuild
 2004032241 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
-2011141239 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
+2011282039 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild
 2001211409 ./x11-themes/adwaita-qt/adwaita-qt-1.1.1.ebuild
 2007142239 ./x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
 2003261841 ./x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild
@@ -30044,7 +30008,6 @@
 1805050439 ./x11-themes/zukitwo/zukitwo-2016.08.08.ebuild
 2010181039 ./x11-themes/e-flat-theme/e-flat-theme-0_pre20201018.ebuild
 1910111911 ./x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
-2002112051 ./x11-wm/aewm/aewm-1.3.12.ebuild
 2011130239 ./x11-wm/aewm/aewm-1.3.12-r1.ebuild
 2005080139 ./x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
 2001192239 ./x11-wm/awesome/awesome-3.5.9-r3.ebuild
@@ -30069,11 +30032,9 @@
 1910111911 ./x11-wm/evilwm/evilwm-1.1.1.ebuild
 2002112051 ./x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
 2010111309 ./x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
-1912111540 ./x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
 2002231739 ./x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
 2008051739 ./x11-wm/fvwm/fvwm-2.6.9.ebuild
 2010311439 ./x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
-2010311439 ./x11-wm/goomwwm/goomwwm-1.0.0.ebuild
 2010311439 ./x11-wm/goomwwm/goomwwm-9999.ebuild
 2002061439 ./x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
 2006071439 ./x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
@@ -30112,7 +30073,7 @@
 2006172239 ./x11-wm/page/page-1.9.8.ebuild
 2006172239 ./x11-wm/page/page-1.9.9-r3.ebuild
 1910111911 ./x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
-1910111911 ./x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
+2011291139 ./x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
 2009121439 ./x11-wm/qtile/qtile-0.15.1.ebuild
 2009121809 ./x11-wm/qtile/qtile-0.16.1.ebuild
 1912210209 ./x11-wm/ratpoison/ratpoison-9999.ebuild
@@ -30513,9 +30474,11 @@
 2011120939 metadata/md5-cache/acct-group/upmpdcli-0
 2011141339 metadata/md5-cache/acct-group/freenet-0
 2011160739 metadata/md5-cache/acct-group/ipsec-0
-2011280409 metadata/md5-cache/acct-group/Manifest.gz
 2011272339 metadata/md5-cache/acct-group/cgit-0
 2011280409 metadata/md5-cache/acct-group/minidlna-0
+2011290239 metadata/md5-cache/acct-group/Manifest.gz
+2011290239 metadata/md5-cache/acct-group/sniproxy-0
+2011290239 metadata/md5-cache/acct-group/ziproxy-0
 2011061444 metadata/md5-cache/acct-user/abrt-0
 2011061444 metadata/md5-cache/acct-user/airdcppd-0
 2011061444 metadata/md5-cache/acct-user/alias-0
@@ -30754,9 +30717,11 @@
 2011120939 metadata/md5-cache/acct-user/upmpdcli-0
 2011141339 metadata/md5-cache/acct-user/freenet-0
 2011151939 metadata/md5-cache/acct-user/ipsec-0
-2011280409 metadata/md5-cache/acct-user/Manifest.gz
 2011272339 metadata/md5-cache/acct-user/cgit-0
 2011280409 metadata/md5-cache/acct-user/minidlna-0
+2011290239 metadata/md5-cache/acct-user/Manifest.gz
+2011290239 metadata/md5-cache/acct-user/sniproxy-0
+2011290239 metadata/md5-cache/acct-user/ziproxy-0
 2002230040 metadata/md5-cache/app-accessibility/sound-icons-0.1
 2004032241 metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6
 2009251309 metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
@@ -31008,8 +30973,6 @@
 2011252124 metadata/md5-cache/app-admin/haskell-updater-1.3.1
 2011252124 metadata/md5-cache/app-admin/haskell-updater-1.3.2
 2011252124 metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r29
-2011252124 metadata/md5-cache/app-admin/helm-2.16.1
-2011252124 metadata/md5-cache/app-admin/helm-2.16.9
 2011252124 metadata/md5-cache/app-admin/helm-3.3.4
 2011252124 metadata/md5-cache/app-admin/ide-smart-1.4-r2
 2011252124 metadata/md5-cache/app-admin/integrit-4.1-r1
@@ -31160,8 +31123,9 @@
 2011271009 metadata/md5-cache/app-admin/exo-1.21.0
 2011270209 metadata/md5-cache/app-admin/system-config-printer-1.5.13
 2011262339 metadata/md5-cache/app-admin/whowatch-1.8.6
-2011272009 metadata/md5-cache/app-admin/Manifest.gz
 2011272009 metadata/md5-cache/app-admin/graylog-4.0.1
+2011282239 metadata/md5-cache/app-admin/Manifest.gz
+2011282239 metadata/md5-cache/app-admin/helm-3.4.1
 2011252124 metadata/md5-cache/app-antivirus/Manifest.gz
 2011252124 metadata/md5-cache/app-antivirus/clamav-0.102.4
 2011252124 metadata/md5-cache/app-antivirus/clamav-0.103.0-r1
@@ -31451,9 +31415,9 @@
 2011252124 metadata/md5-cache/app-benchmarks/tiobench-0.4.2
 2011252124 metadata/md5-cache/app-benchmarks/wrk-4.1.0-r100
 2011252124 metadata/md5-cache/app-benchmarks/wrk-4.1.0-r2
-2011281009 metadata/md5-cache/app-benchmarks/Manifest.gz
 2011281009 metadata/md5-cache/app-benchmarks/hyperfine-1.11.0
-2011281009 metadata/md5-cache/app-benchmarks/siege-4.0.7
+2011291139 metadata/md5-cache/app-benchmarks/Manifest.gz
+2011291139 metadata/md5-cache/app-benchmarks/siege-4.0.7
 1803032108 metadata/md5-cache/app-cdr/burncdda-1.8.3
 1910111840 metadata/md5-cache/app-cdr/ccd2iso-0.3
 1805212239 metadata/md5-cache/app-cdr/cdlabelgen-4.3.0
@@ -32396,7 +32360,6 @@
 2010121339 metadata/md5-cache/app-doc/e16-docs-0.16.8.0.2
 2011181909 metadata/md5-cache/app-doc/geant-docs-4.10.6
 2011181909 metadata/md5-cache/app-doc/geant-docs-4.10.6c
-2011252124 metadata/md5-cache/app-doc/Manifest.gz
 2011252124 metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
 2011252124 metadata/md5-cache/app-doc/cppman-0.4.8-r2
 2011252124 metadata/md5-cache/app-doc/cppman-0.4.9
@@ -32411,7 +32374,6 @@
 2011252124 metadata/md5-cache/app-doc/elisp-manual-24.5
 2011252124 metadata/md5-cache/app-doc/gimp-help-2.10.0-r1
 2011252124 metadata/md5-cache/app-doc/gnucash-docs-4.2
-2011252124 metadata/md5-cache/app-doc/halibut-1.2
 2011252124 metadata/md5-cache/app-doc/kicad-doc-5.1.6
 2011252124 metadata/md5-cache/app-doc/kicad-doc-5.1.7
 2011252124 metadata/md5-cache/app-doc/kicad-doc-5.1.8
@@ -32420,6 +32382,8 @@
 2011252124 metadata/md5-cache/app-doc/psmark-2.1
 2011252124 metadata/md5-cache/app-doc/votca-csg-manual-9999
 2011252124 metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
+2011290239 metadata/md5-cache/app-doc/Manifest.gz
+2011290239 metadata/md5-cache/app-doc/halibut-1.2
 1702282308 metadata/md5-cache/app-editors/jupp-3.1_p30
 1811251609 metadata/md5-cache/app-editors/jupp-3.1_p38
 1702282308 metadata/md5-cache/app-editors/le-1.16.1
@@ -32458,13 +32422,6 @@
 2011252124 metadata/md5-cache/app-editors/elvis-2.2.0-r7
 2011252124 metadata/md5-cache/app-editors/elvis-2.2.0-r8
 2011252124 metadata/md5-cache/app-editors/emacs-18.59-r13
-2011252124 metadata/md5-cache/app-editors/emacs-23.4-r20
-2011252124 metadata/md5-cache/app-editors/emacs-24.5-r9
-2011252124 metadata/md5-cache/app-editors/emacs-25.3-r8
-2011252124 metadata/md5-cache/app-editors/emacs-26.3-r3
-2011252124 metadata/md5-cache/app-editors/emacs-27.1-r2
-2011252124 metadata/md5-cache/app-editors/emacs-27.1.9999-r1
-2011252124 metadata/md5-cache/app-editors/emacs-28.0.9999
 2011252124 metadata/md5-cache/app-editors/emact-2.58.0
 2011252124 metadata/md5-cache/app-editors/ersatz-emacs-20060515-r1
 2011252124 metadata/md5-cache/app-editors/fe-2.0
@@ -32555,8 +32512,16 @@
 2011252124 metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3-r1
 2011252124 metadata/md5-cache/app-editors/zile-2.3.24-r2
 2011252124 metadata/md5-cache/app-editors/zile-2.4.14
-2011271939 metadata/md5-cache/app-editors/Manifest.gz
 2011271939 metadata/md5-cache/app-editors/ghex-3.18.4-r1
+2011281539 metadata/md5-cache/app-editors/Manifest.gz
+2011281539 metadata/md5-cache/app-editors/emacs-23.4-r20
+2011281539 metadata/md5-cache/app-editors/emacs-24.5-r9
+2011281539 metadata/md5-cache/app-editors/emacs-25.3-r8
+2011281539 metadata/md5-cache/app-editors/emacs-26.3-r3
+2011281539 metadata/md5-cache/app-editors/emacs-27.1-r2
+2011281539 metadata/md5-cache/app-editors/emacs-27.1-r3
+2011281539 metadata/md5-cache/app-editors/emacs-27.1.9999-r1
+2011281539 metadata/md5-cache/app-editors/emacs-28.0.9999
 2009251309 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2009251309 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2009251309 metadata/md5-cache/app-emacs/analog-1.9.99
@@ -32831,7 +32796,6 @@
 1902072239 metadata/md5-cache/app-emulation/go-secbench-0.1.0
 1902072239 metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
 1904141209 metadata/md5-cache/app-emulation/grub-xen-host-1.0
-1902072239 metadata/md5-cache/app-emulation/kompose-1.16.0
 1907271310 metadata/md5-cache/app-emulation/s6-overlay-1.18.1.3
 1905112309 metadata/md5-cache/app-emulation/spice-html5-0.2.1
 1902072239 metadata/md5-cache/app-emulation/umoci-0.2.1
@@ -32850,7 +32814,6 @@
 1908172039 metadata/md5-cache/app-emulation/wine-mono-4.9.2
 1909282039 metadata/md5-cache/app-emulation/wine-mono-4.9.3
 1702282308 metadata/md5-cache/app-emulation/xcpc-20070122
-1911250109 metadata/md5-cache/app-emulation/kompose-1.19.0
 1911302339 metadata/md5-cache/app-emulation/virt-what-1.20
 1912051009 metadata/md5-cache/app-emulation/img-0.5.7-r1
 1912111539 metadata/md5-cache/app-emulation/docker-machine-0.13.0
@@ -33062,12 +33025,12 @@
 2011252124 metadata/md5-cache/app-emulation/xen-tools-4.13.2-r1
 2011252124 metadata/md5-cache/app-emulation/xen-tools-4.14.0-r4
 2011252124 metadata/md5-cache/app-emulation/xtrs-4.9d-r5
-2011281009 metadata/md5-cache/app-emulation/Manifest.gz
 2011281009 metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
 2011272339 metadata/md5-cache/app-emulation/snapd-2.47.1-r1
 2011280009 metadata/md5-cache/app-emulation/snapd-2.48
 2011272009 metadata/md5-cache/app-emulation/xen-4.13.2-r2
 2011272009 metadata/md5-cache/app-emulation/xen-4.14.0-r6
+2011290409 metadata/md5-cache/app-emulation/Manifest.gz
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1-r1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1.1
 1911131109 metadata/md5-cache/app-eselect/eselect-lcdfilter-2
@@ -33213,7 +33176,6 @@
 2011142339 metadata/md5-cache/app-i18n/scim-m17n-0.2.3
 2011162309 metadata/md5-cache/app-i18n/libhangul-0.1.0
 2011211209 metadata/md5-cache/app-i18n/skk-jisyo-999999
-2011252124 metadata/md5-cache/app-i18n/Manifest.gz
 2011252124 metadata/md5-cache/app-i18n/bidiv-1.5_p4
 2011252124 metadata/md5-cache/app-i18n/canfep-1.0-r1
 2011252124 metadata/md5-cache/app-i18n/canna-3.7_p3-r1
@@ -33339,7 +33301,6 @@
 2011252124 metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
 2011252124 metadata/md5-cache/app-i18n/uchardet-0.0.7
 2011252124 metadata/md5-cache/app-i18n/uchardet-9999
-2011252124 metadata/md5-cache/app-i18n/uim-1.8.8
 2011252124 metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0
 2011252124 metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3
 2011252124 metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20200306162733
@@ -33347,6 +33308,8 @@
 2011252124 metadata/md5-cache/app-i18n/yaskkserv-1.1.1-r1
 2011252124 metadata/md5-cache/app-i18n/zinnia-0.06-r3
 2011252124 metadata/md5-cache/app-i18n/zinnia-tomoe-0.6.0_p20080911
+2011290239 metadata/md5-cache/app-i18n/Manifest.gz
+2011290239 metadata/md5-cache/app-i18n/uim-1.8.8
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2011252124 metadata/md5-cache/app-laptop/Manifest.gz
 2011252124 metadata/md5-cache/app-laptop/dispad-0.3.1-r1
@@ -33786,7 +33749,6 @@
 2011252124 metadata/md5-cache/app-misc/resolve-march-native-1.0.0
 2011252124 metadata/md5-cache/app-misc/rioutil-1.5.4
 2011252124 metadata/md5-cache/app-misc/rl-0.2.7-r1
-2011252124 metadata/md5-cache/app-misc/rox-filer-2.11
 2011252124 metadata/md5-cache/app-misc/rundeck-bin-2.6.8
 2011252124 metadata/md5-cache/app-misc/rundeck-cli-bin-0.1.11
 2011252124 metadata/md5-cache/app-misc/screen-4.8.0
@@ -33867,13 +33829,14 @@
 2011252124 metadata/md5-cache/app-misc/zisofs-tools-1.0.8
 2011252124 metadata/md5-cache/app-misc/zygrib-8.0.1-r1
 2011270109 metadata/md5-cache/app-misc/banner-1.3.5
-2011281009 metadata/md5-cache/app-misc/Manifest.gz
 2011271409 metadata/md5-cache/app-misc/mc-4.8.25-r1
 2011281009 metadata/md5-cache/app-misc/rpick-0.6.1
 2011281009 metadata/md5-cache/app-misc/rpick-0.7.0
 2011281009 metadata/md5-cache/app-misc/skim-0.6.9
 2011281009 metadata/md5-cache/app-misc/skim-0.7.0
 2011281009 metadata/md5-cache/app-misc/skim-0.8.1
+2011282109 metadata/md5-cache/app-misc/Manifest.gz
+2011282109 metadata/md5-cache/app-misc/rox-filer-2.11
 1702282309 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1710020739 metadata/md5-cache/app-mobilephone/dfu-util-0.9
 1908291509 metadata/md5-cache/app-mobilephone/gnocky-0.0.7
@@ -33936,9 +33899,6 @@
 2011252124 metadata/md5-cache/app-office/libalkimia-8.0.4
 2011252124 metadata/md5-cache/app-office/libreoffice-6.4.6.2-r2
 2011252124 metadata/md5-cache/app-office/libreoffice-6.4.7.2
-2011252124 metadata/md5-cache/app-office/libreoffice-7.0.3.1
-2011252124 metadata/md5-cache/app-office/libreoffice-7.0.9999
-2011252124 metadata/md5-cache/app-office/libreoffice-9999
 2011252124 metadata/md5-cache/app-office/libreoffice-bin-6.4.6.2-r2
 2011252124 metadata/md5-cache/app-office/lyx-2.3.5.2-r2
 2011252124 metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
@@ -33967,8 +33927,11 @@
 2011252124 metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
 2011252124 metadata/md5-cache/app-office/wps-office-11.1.0.9505
 2011252124 metadata/md5-cache/app-office/wps-office-11.1.0.9615
-2011270239 metadata/md5-cache/app-office/Manifest.gz
 2011270239 metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
+2011290109 metadata/md5-cache/app-office/Manifest.gz
+2011290109 metadata/md5-cache/app-office/libreoffice-7.0.3.1
+2011290109 metadata/md5-cache/app-office/libreoffice-7.0.9999
+2011290109 metadata/md5-cache/app-office/libreoffice-9999
 2009121921 metadata/md5-cache/app-officeext/ct2n-1.5.0
 2009121921 metadata/md5-cache/app-officeext/languagetool-5.0
 2009121921 metadata/md5-cache/app-officeext/ooofbtools-2.56
@@ -34119,8 +34082,8 @@
 2011252124 metadata/md5-cache/app-portage/ufed-9999
 2011252124 metadata/md5-cache/app-portage/unsymlink-lib-18
 2011252124 metadata/md5-cache/app-portage/unsymlink-lib-19
-2011271339 metadata/md5-cache/app-portage/Manifest.gz
-2011271339 metadata/md5-cache/app-portage/nattka-0.2.11
+2011281109 metadata/md5-cache/app-portage/Manifest.gz
+2011281109 metadata/md5-cache/app-portage/nattka-0.2.11
 1712261510 metadata/md5-cache/app-shells/dsh-0.25.10-r1
 1910170740 metadata/md5-cache/app-shells/psh-1.8.1-r3
 1907092339 metadata/md5-cache/app-shells/rush-2.0
@@ -34305,7 +34268,6 @@
 2006251139 metadata/md5-cache/app-text/convmv-2.05-r1
 2006291309 metadata/md5-cache/app-text/txt2man-1.7.1
 2007040239 metadata/md5-cache/app-text/binfind-0.0.3
-2007231439 metadata/md5-cache/app-text/wgetpaste-2.29-r1
 2008042209 metadata/md5-cache/app-text/gv-3.7.3.90
 2008121539 metadata/md5-cache/app-text/dvipsk-2020.1_p20200406
 2008121539 metadata/md5-cache/app-text/epspdf-0.6.0-r1
@@ -34365,9 +34327,6 @@
 2011252124 metadata/md5-cache/app-text/blogc-9999
 2011252124 metadata/md5-cache/app-text/bogosort-0.4.2-r1
 2011252124 metadata/md5-cache/app-text/c2ps-4.0
-2011252124 metadata/md5-cache/app-text/calibre-4.22.0
-2011252124 metadata/md5-cache/app-text/calibre-4.23.0
-2011252124 metadata/md5-cache/app-text/calibre-5.4.2
 2011252124 metadata/md5-cache/app-text/capyt-1.1.1
 2011252124 metadata/md5-cache/app-text/cb2bib-2.0.0-r1
 2011252124 metadata/md5-cache/app-text/chasen-2.4.4-r3
@@ -34403,7 +34362,6 @@
 2011252124 metadata/md5-cache/app-text/djview-4.10.6-r2
 2011252124 metadata/md5-cache/app-text/djvu-3.5.27-r2
 2011252124 metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r4
-2011252124 metadata/md5-cache/app-text/docbook2X-0.8.8-r4
 2011252124 metadata/md5-cache/app-text/dos2unix-7.3.5
 2011252124 metadata/md5-cache/app-text/dos2unix-7.4.1
 2011252124 metadata/md5-cache/app-text/dos2unix-7.4.2
@@ -34663,11 +34621,9 @@
 2011252124 metadata/md5-cache/app-text/zathura-pdf-poppler-9999
 2011252124 metadata/md5-cache/app-text/zathura-ps-0.2.6
 2011252124 metadata/md5-cache/app-text/zathura-ps-9999
-2011261139 metadata/md5-cache/app-text/ansifilter-2.17
 2011271209 metadata/md5-cache/app-text/diction-1.14
 2011271139 metadata/md5-cache/app-text/tree-1.8.0
 2011270009 metadata/md5-cache/app-text/u2ps-1.2
-2011281009 metadata/md5-cache/app-text/Manifest.gz
 2011271939 metadata/md5-cache/app-text/an-1.2_p6
 2011271909 metadata/md5-cache/app-text/barcode-0.99
 2011271939 metadata/md5-cache/app-text/bdf2psf-1.155
@@ -34676,6 +34632,13 @@
 2011271909 metadata/md5-cache/app-text/pastebinit-1.5.1
 2011271909 metadata/md5-cache/app-text/u2ps-1.1
 2011271939 metadata/md5-cache/app-text/wdiff-1.2.2-r1
+2011290209 metadata/md5-cache/app-text/Manifest.gz
+2011281109 metadata/md5-cache/app-text/ansifilter-2.17
+2011290209 metadata/md5-cache/app-text/calibre-4.22.0
+2011290209 metadata/md5-cache/app-text/calibre-4.23.0
+2011290209 metadata/md5-cache/app-text/calibre-5.4.2
+2011281239 metadata/md5-cache/app-text/docbook2X-0.8.8-r4
+2011281109 metadata/md5-cache/app-text/wgetpaste-2.29-r1
 1911262256 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 1911262256 metadata/md5-cache/app-vim/airline-themes-0_pre20181021
 1911262256 metadata/md5-cache/app-vim/alternate-2.18-r2
@@ -34756,7 +34719,6 @@
 1911262256 metadata/md5-cache/app-vim/tasklist-1.0.1
 1911262256 metadata/md5-cache/app-vim/tlib-1.22
 1911262256 metadata/md5-cache/app-vim/tlib-1.23
-1911262256 metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
 1911262256 metadata/md5-cache/app-vim/txtfmt-2.4-r1
 1911262256 metadata/md5-cache/app-vim/txtfmt-3.1
 1911262256 metadata/md5-cache/app-vim/undotree-6.0
@@ -34881,7 +34843,6 @@
 2011151809 metadata/md5-cache/app-vim/csound-syntax-20160804
 2011200809 metadata/md5-cache/app-vim/omnicppcomplete-0.41
 2011220109 metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
-2011252124 metadata/md5-cache/app-vim/Manifest.gz
 2011252124 metadata/md5-cache/app-vim/alternate-2.18-r1
 2011252124 metadata/md5-cache/app-vim/colorschemes-20140623-r1
 2011252124 metadata/md5-cache/app-vim/command-t-5.0.3
@@ -34918,6 +34879,8 @@
 2011252124 metadata/md5-cache/app-vim/vimpython-1.13-r2
 2011252124 metadata/md5-cache/app-vim/vimpython-1.13-r3
 2011252124 metadata/md5-cache/app-vim/voom-5.3-r1
+2011281309 metadata/md5-cache/app-vim/Manifest.gz
+2011281309 metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
 1704032208 metadata/md5-cache/app-xemacs/dired-1.19
 1704032208 metadata/md5-cache/app-xemacs/easypg-1.02
 1704032208 metadata/md5-cache/app-xemacs/ediff-1.77
@@ -35279,7 +35242,6 @@
 1702282310 metadata/md5-cache/dev-cpp/metslib-0.5.3
 1702282310 metadata/md5-cache/dev-cpp/pngpp-0.2.9
 1702282310 metadata/md5-cache/dev-cpp/random123-1.09-r1
-1808221139 metadata/md5-cache/dev-cpp/tclap-1.2.2
 2003311822 metadata/md5-cache/dev-cpp/sourcetrail-2019.2.39
 2003311822 metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46
 2003311822 metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46-r2
@@ -35287,7 +35249,6 @@
 2008170709 metadata/md5-cache/dev-cpp/asio-1.18.0
 2009071209 metadata/md5-cache/dev-cpp/asio-1.17.0
 2011252124 metadata/md5-cache/dev-cpp/ETL-0.04.15-r1
-2011252124 metadata/md5-cache/dev-cpp/Manifest.gz
 2011252124 metadata/md5-cache/dev-cpp/abseil-cpp-20200225.2
 2011252124 metadata/md5-cache/dev-cpp/abseil-cpp-20200923.2
 2011252124 metadata/md5-cache/dev-cpp/aixlog-1.4.0
@@ -35387,6 +35348,9 @@
 2011252124 metadata/md5-cache/dev-cpp/waylandpp-9999
 2011252124 metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
 2011252124 metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r3
+2011291139 metadata/md5-cache/dev-cpp/Manifest.gz
+2011282309 metadata/md5-cache/dev-cpp/amqp-cpp-4.3.10
+2011291139 metadata/md5-cache/dev-cpp/tclap-1.2.2
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 1910170740 metadata/md5-cache/dev-db/innotop-1.12.0
 1702282310 metadata/md5-cache/dev-db/lmdb++-0.9.14.0
@@ -35468,7 +35432,6 @@
 2011252124 metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
 2011252124 metadata/md5-cache/dev-db/libiodbc-3.52.12
 2011252124 metadata/md5-cache/dev-db/libodbc++-0.2.5-r2
-2011252124 metadata/md5-cache/dev-db/libzdb-3.1
 2011252124 metadata/md5-cache/dev-db/libzdb-3.1-r1
 2011252124 metadata/md5-cache/dev-db/lmdb-0.9.23
 2011252124 metadata/md5-cache/dev-db/lmdb-0.9.24
@@ -35476,15 +35439,12 @@
 2011252124 metadata/md5-cache/dev-db/mariadb-10.2.32-r3
 2011252124 metadata/md5-cache/dev-db/mariadb-10.2.34
 2011252124 metadata/md5-cache/dev-db/mariadb-10.2.35
-2011252124 metadata/md5-cache/dev-db/mariadb-10.2.36
 2011252124 metadata/md5-cache/dev-db/mariadb-10.3.23-r3
 2011252124 metadata/md5-cache/dev-db/mariadb-10.3.25
 2011252124 metadata/md5-cache/dev-db/mariadb-10.3.26
-2011252124 metadata/md5-cache/dev-db/mariadb-10.3.27
 2011252124 metadata/md5-cache/dev-db/mariadb-10.4.13-r3
 2011252124 metadata/md5-cache/dev-db/mariadb-10.4.15
 2011252124 metadata/md5-cache/dev-db/mariadb-10.4.16
-2011252124 metadata/md5-cache/dev-db/mariadb-10.4.17
 2011252124 metadata/md5-cache/dev-db/mariadb-10.5.6
 2011252124 metadata/md5-cache/dev-db/mariadb-10.5.7
 2011252124 metadata/md5-cache/dev-db/mariadb-10.5.8
@@ -35609,10 +35569,13 @@
 2011252124 metadata/md5-cache/dev-db/wxsqlite3-3.2.1-r1
 2011260609 metadata/md5-cache/dev-db/pgrouting-3.1.1
 2011260209 metadata/md5-cache/dev-db/redis-5.0.9-r1
-2011272109 metadata/md5-cache/dev-db/Manifest.gz
 2011271909 metadata/md5-cache/dev-db/mariadb-connector-c-3.1.11
 2011271939 metadata/md5-cache/dev-db/myodbc-8.0.22
 2011271909 metadata/md5-cache/dev-db/mysql-connector-c-8.0.22
+2011282209 metadata/md5-cache/dev-db/Manifest.gz
+2011281239 metadata/md5-cache/dev-db/mariadb-10.2.36
+2011281239 metadata/md5-cache/dev-db/mariadb-10.3.27
+2011281239 metadata/md5-cache/dev-db/mariadb-10.4.17
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2011252124 metadata/md5-cache/dev-dotnet/Manifest.gz
@@ -35705,8 +35668,9 @@
 2011252124 metadata/md5-cache/dev-embedded/usbprog-0.2.0-r1
 2011252124 metadata/md5-cache/dev-embedded/xa-2.3.10
 2011252124 metadata/md5-cache/dev-embedded/zmac-1.3-r1
-2011260839 metadata/md5-cache/dev-embedded/Manifest.gz
 2011260839 metadata/md5-cache/dev-embedded/rpi-eeprom-10.2_p1
+2011281239 metadata/md5-cache/dev-embedded/Manifest.gz
+2011281239 metadata/md5-cache/dev-embedded/esptool-3.0
 2005120109 metadata/md5-cache/dev-erlang/eredis-1.0.8
 2005120109 metadata/md5-cache/dev-erlang/goldrush-0.1.9
 2005120109 metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
@@ -36685,7 +36649,6 @@
 2011252124 metadata/md5-cache/dev-haskell/x509-store-1.6.7
 2011252124 metadata/md5-cache/dev-haskell/x509-system-1.6.6
 2011252124 metadata/md5-cache/dev-haskell/x509-validation-1.6.11
-2011252124 metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1
 2011252124 metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
 2011252124 metadata/md5-cache/dev-haskell/xml-1.3.14
 2011252124 metadata/md5-cache/dev-haskell/xml-conduit-1.9.0.0
@@ -36710,8 +36673,8 @@
 2011252124 metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
 2011252124 metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0
 2011252124 metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
-2011260239 metadata/md5-cache/dev-haskell/Manifest.gz
 2011260239 metadata/md5-cache/dev-haskell/conduit-1.3.4
+2011281509 metadata/md5-cache/dev-haskell/Manifest.gz
 1702282312 metadata/md5-cache/dev-java/java-apicheck-0_p20150907
 2008301909 metadata/md5-cache/dev-java/gradle-bin-6.3
 2008301909 metadata/md5-cache/dev-java/sbt-bin-1.3.10
@@ -37548,7 +37511,6 @@
 2011252124 metadata/md5-cache/dev-lang/jsonnet-0.15.0
 2011252124 metadata/md5-cache/dev-lang/jsonnet-0.16.0
 2011252124 metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
-2011252124 metadata/md5-cache/dev-lang/jsonnet-0.17.0
 2011252124 metadata/md5-cache/dev-lang/julia-1.2.0
 2011252124 metadata/md5-cache/dev-lang/julia-1.3.0
 2011252124 metadata/md5-cache/dev-lang/julia-1.4.0-r1
@@ -37675,7 +37637,6 @@
 2011252124 metadata/md5-cache/dev-lang/spidermonkey-68.12.0
 2011252124 metadata/md5-cache/dev-lang/spidermonkey-78.4.1
 2011252124 metadata/md5-cache/dev-lang/squirrel-3.1_p20200612
-2011252124 metadata/md5-cache/dev-lang/srf-1.0-r2
 2011252124 metadata/md5-cache/dev-lang/swi-prolog-8.2.1
 2011252124 metadata/md5-cache/dev-lang/swi-prolog-8.3.8
 2011252124 metadata/md5-cache/dev-lang/swi-prolog-8.3.9
@@ -37716,9 +37677,11 @@
 2011261739 metadata/md5-cache/dev-lang/php-7.4.13
 2011262239 metadata/md5-cache/dev-lang/rust-1.48.0
 2011262309 metadata/md5-cache/dev-lang/spidermonkey-78.5.0
-2011281009 metadata/md5-cache/dev-lang/Manifest.gz
 2011271939 metadata/md5-cache/dev-lang/rust-1.47.0-r2
 2011271939 metadata/md5-cache/dev-lang/rust-bin-1.47.0-r1
+2011290239 metadata/md5-cache/dev-lang/Manifest.gz
+2011290109 metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
+2011290239 metadata/md5-cache/dev-lang/srf-1.0-r2
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1705071608 metadata/md5-cache/dev-libs/concurrencykit-0.6.0
 1806262009 metadata/md5-cache/dev-libs/cudnn-7.1.4
@@ -38016,7 +37979,6 @@
 2011252124 metadata/md5-cache/dev-libs/hyperscan-5.2.1-r1
 2011252124 metadata/md5-cache/dev-libs/hyperscan-5.3.0
 2011252124 metadata/md5-cache/dev-libs/icu-67.1
-2011252124 metadata/md5-cache/dev-libs/icu-68.1
 2011252124 metadata/md5-cache/dev-libs/icu-layoutex-67.1
 2011252124 metadata/md5-cache/dev-libs/icu-layoutex-68.1
 2011252124 metadata/md5-cache/dev-libs/icu-le-hb-1.0.3-r1
@@ -38038,7 +38000,6 @@
 2011252124 metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
 2011252124 metadata/md5-cache/dev-libs/ivykis-0.42.4
 2011252124 metadata/md5-cache/dev-libs/jansson-2.12
-2011252124 metadata/md5-cache/dev-libs/jansson-2.13.1
 2011252124 metadata/md5-cache/dev-libs/jemalloc-3.6.0
 2011252124 metadata/md5-cache/dev-libs/jemalloc-4.4.0
 2011252124 metadata/md5-cache/dev-libs/jemalloc-4.5.0
@@ -38054,7 +38015,6 @@
 2011252124 metadata/md5-cache/dev-libs/json-glib-1.4.4
 2011252124 metadata/md5-cache/dev-libs/json-glib-1.6.0
 2011252124 metadata/md5-cache/dev-libs/jsoncpp-1.9.3
-2011252124 metadata/md5-cache/dev-libs/jsoncpp-1.9.4
 2011252124 metadata/md5-cache/dev-libs/jsonrpc-glib-3.34.0
 2011252124 metadata/md5-cache/dev-libs/jthread-1.3.3
 2011252124 metadata/md5-cache/dev-libs/judy-1.0.5-r2
@@ -38075,7 +38035,6 @@
 2011252124 metadata/md5-cache/dev-libs/leatherman-1.12.0-r1
 2011252124 metadata/md5-cache/dev-libs/leatherman-1.12.1
 2011252124 metadata/md5-cache/dev-libs/leatherman-1.12.1-r2
-2011252124 metadata/md5-cache/dev-libs/leatherman-1.12.2
 2011252124 metadata/md5-cache/dev-libs/leatherman-1.12.3
 2011252124 metadata/md5-cache/dev-libs/leatherman-1.3.0
 2011252124 metadata/md5-cache/dev-libs/level-zero-0.91.10
@@ -38175,7 +38134,6 @@
 2011252124 metadata/md5-cache/dev-libs/liberasurecode-1.6.2
 2011252124 metadata/md5-cache/dev-libs/libestr-0.1.11
 2011252124 metadata/md5-cache/dev-libs/libev-4.31
-2011252124 metadata/md5-cache/dev-libs/libev-4.33
 2011252124 metadata/md5-cache/dev-libs/libevdev-1.10.0
 2011252124 metadata/md5-cache/dev-libs/libevdev-1.9.1
 2011252124 metadata/md5-cache/dev-libs/libevdev-9999
@@ -38235,8 +38193,6 @@
 2011252124 metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
 2011252124 metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
 2011252124 metadata/md5-cache/dev-libs/libinput-1.16.1
-2011252124 metadata/md5-cache/dev-libs/libinput-1.16.2
-2011252124 metadata/md5-cache/dev-libs/libinput-1.16.3
 2011252124 metadata/md5-cache/dev-libs/libintl-0.19.7
 2011252124 metadata/md5-cache/dev-libs/libintl-0.19.8.1
 2011252124 metadata/md5-cache/dev-libs/libintl-0.20.1
@@ -38705,10 +38661,17 @@
 2011262039 metadata/md5-cache/dev-libs/libressl-3.3.0
 2011262139 metadata/md5-cache/dev-libs/pugixml-1.11
 2011262039 metadata/md5-cache/dev-libs/rocksdb-6.14.5
-2011280309 metadata/md5-cache/dev-libs/Manifest.gz
 2011280039 metadata/md5-cache/dev-libs/libmanette-0.2.5
 2011271939 metadata/md5-cache/dev-libs/mpc-1.2.1
 2011280309 metadata/md5-cache/dev-libs/nettle-3.6-r3
+2011291139 metadata/md5-cache/dev-libs/Manifest.gz
+2011282209 metadata/md5-cache/dev-libs/icu-68.1
+2011281509 metadata/md5-cache/dev-libs/jansson-2.13.1
+2011281709 metadata/md5-cache/dev-libs/jsoncpp-1.9.4
+2011291139 metadata/md5-cache/dev-libs/leatherman-1.12.2
+2011281539 metadata/md5-cache/dev-libs/libev-4.33
+2011291139 metadata/md5-cache/dev-libs/libinput-1.16.3
+2011281409 metadata/md5-cache/dev-libs/libinput-1.16.4
 1910111840 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2011252124 metadata/md5-cache/dev-lisp/Manifest.gz
 2011252124 metadata/md5-cache/dev-lisp/abcl-1.5.0
@@ -38761,33 +38724,25 @@
 1902152109 metadata/md5-cache/dev-lua/luajson-1.3.3
 2005201909 metadata/md5-cache/dev-lua/lutok-0.4-r2
 2009131009 metadata/md5-cache/dev-lua/luarocks-3.3.1
-2011252124 metadata/md5-cache/dev-lua/LuaBitOp-1.0.1-r1
-2011252124 metadata/md5-cache/dev-lua/LuaBitOp-1.0.2
-2011252124 metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1
 2011252124 metadata/md5-cache/dev-lua/busted-2.0_rc11_p0
 2011252124 metadata/md5-cache/dev-lua/busted-2.0_rc12_p1
 2011252124 metadata/md5-cache/dev-lua/lanes-3.10.0
 2011252124 metadata/md5-cache/dev-lua/lgi-0.9.2
 2011252124 metadata/md5-cache/dev-lua/lpeg-1.0.1
 2011252124 metadata/md5-cache/dev-lua/lpeg-1.0.2
-2011252124 metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
 2011252124 metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r101
 2011252124 metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r2
 2011252124 metadata/md5-cache/dev-lua/lua-cjson-2.1.0.6
 2011252124 metadata/md5-cache/dev-lua/lua-cjson-2.1.0.7
 2011252124 metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r1
 2011252124 metadata/md5-cache/dev-lua/lua-term-0.3
-2011252124 metadata/md5-cache/dev-lua/lua-utf8-0.1.1
 2011252124 metadata/md5-cache/dev-lua/lua-zlib-1.2
 2011252124 metadata/md5-cache/dev-lua/lua-zlib-1.2-r100
 2011252124 metadata/md5-cache/dev-lua/lua_cliargs-2.5_p5
 2011252124 metadata/md5-cache/dev-lua/lua_cliargs-3.0_p1
-2011252124 metadata/md5-cache/dev-lua/luacheck-0.20.0
-2011252124 metadata/md5-cache/dev-lua/luacheck-0.23.0
 2011252124 metadata/md5-cache/dev-lua/luacov-0.8
 2011252124 metadata/md5-cache/dev-lua/luacrypto-0.3.2-r1
 2011252124 metadata/md5-cache/dev-lua/luadbi-0.7.2
-2011252124 metadata/md5-cache/dev-lua/luadbi-0.7.2-r100
 2011252124 metadata/md5-cache/dev-lua/luaevent-0.4.6
 2011252124 metadata/md5-cache/dev-lua/luaevent-0.4.6-r100
 2011252124 metadata/md5-cache/dev-lua/luaexpat-1.3.0-r100
@@ -38803,7 +38758,6 @@
 2011252124 metadata/md5-cache/dev-lua/luaossl-20190731
 2011252124 metadata/md5-cache/dev-lua/luaposix-35.0
 2011252124 metadata/md5-cache/dev-lua/luasec-0.9
-2011252124 metadata/md5-cache/dev-lua/luasec-0.9-r100
 2011252124 metadata/md5-cache/dev-lua/luasec-9999
 2011252124 metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r5
 2011252124 metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328
@@ -38827,12 +38781,39 @@
 2011261139 metadata/md5-cache/dev-lua/dkjson-2.5
 2011261139 metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0
 2011261139 metadata/md5-cache/dev-lua/say-1.3_p1-r1
-2011270209 metadata/md5-cache/dev-lua/Manifest.gz
 2011270209 metadata/md5-cache/dev-lua/lua-term-0.7
 2011270209 metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2
 2011270209 metadata/md5-cache/dev-lua/luassert-1.8.0
 2011270209 metadata/md5-cache/dev-lua/luasystem-0.2.1_p0
 2011270209 metadata/md5-cache/dev-lua/penlight-1.7.0
+2011290239 metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r100
+2011290239 metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r2
+2011290439 metadata/md5-cache/dev-lua/Manifest.gz
+2011282109 metadata/md5-cache/dev-lua/busted-2.0.0-r101
+2011281939 metadata/md5-cache/dev-lua/dkjson-2.5-r100
+2011290139 metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
+2011290339 metadata/md5-cache/dev-lua/lgi-0.9.2-r100
+2011290139 metadata/md5-cache/dev-lua/lpeg-1.0.2-r100
+2011290239 metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
+2011290439 metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
+2011290439 metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r100
+2011281939 metadata/md5-cache/dev-lua/lua-term-0.7-r100
+2011290309 metadata/md5-cache/dev-lua/lua-utf8-0.1.3
+2011290309 metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100
+2011281939 metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100
+2011290439 metadata/md5-cache/dev-lua/luacheck-0.20.0-r1
+2011290439 metadata/md5-cache/dev-lua/luacheck-0.23.0-r1
+2011290439 metadata/md5-cache/dev-lua/luacheck-0.23.0-r100
+2011282109 metadata/md5-cache/dev-lua/luadbi-0.7.2-r101
+2011290239 metadata/md5-cache/dev-lua/luajson-1.3.4
+2011282109 metadata/md5-cache/dev-lua/luasec-0.9-r101
+2011282109 metadata/md5-cache/dev-lua/luassert-1.8.0-r101
+2011282109 metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r101
+2011282109 metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
+2011290139 metadata/md5-cache/dev-lua/mpack-1.0.4-r100
+2011282109 metadata/md5-cache/dev-lua/penlight-1.9.2
+2011282109 metadata/md5-cache/dev-lua/penlight-1.9.2-r101
+2011282109 metadata/md5-cache/dev-lua/say-1.3_p1-r101
 1704021208 metadata/md5-cache/dev-ml/async_extra-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_kernel-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_rpc_kernel-0.9.0
@@ -38861,7 +38842,6 @@
 1912131839 metadata/md5-cache/dev-ml/biniou-1.0.13
 1912131839 metadata/md5-cache/dev-ml/biniou-1.1.0
 1912131839 metadata/md5-cache/dev-ml/biniou-1.2.0
-1912131839 metadata/md5-cache/dev-ml/camlbz2-0.6.0
 1912131839 metadata/md5-cache/dev-ml/cppo-1.4.1
 1912131839 metadata/md5-cache/dev-ml/cppo-1.5.0
 1912131839 metadata/md5-cache/dev-ml/easy-format-1.0.2
@@ -38880,9 +38860,6 @@
 2002230040 metadata/md5-cache/dev-ml/extlib-1.7.6
 2003312109 metadata/md5-cache/dev-ml/dune-2.1.0
 2006041239 metadata/md5-cache/dev-ml/bos-0.1.6
-2006041239 metadata/md5-cache/dev-ml/cmdliner-1.0.0
-2006041239 metadata/md5-cache/dev-ml/cmdliner-1.0.1
-2006041239 metadata/md5-cache/dev-ml/cmdliner-1.0.2
 2006041239 metadata/md5-cache/dev-ml/jsonm-1.0.1
 2006041239 metadata/md5-cache/dev-ml/logs-0.6.2
 2006041239 metadata/md5-cache/dev-ml/ocamlweb-1.39
@@ -38902,8 +38879,6 @@
 2010131609 metadata/md5-cache/dev-ml/alcotest-0.8.2
 2010131609 metadata/md5-cache/dev-ml/astring-0.8.3
 2010131609 metadata/md5-cache/dev-ml/async-0.9.0
-2010141439 metadata/md5-cache/dev-ml/camlp4-4.04_p1
-2010141439 metadata/md5-cache/dev-ml/camlp4-4.05_p1
 2010141439 metadata/md5-cache/dev-ml/camlp4-4.10_p1
 2010141439 metadata/md5-cache/dev-ml/camlp4-4.11_p1
 2010131609 metadata/md5-cache/dev-ml/core-0.9.1-r1
@@ -39091,7 +39066,6 @@
 2011170309 metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3
 2011170309 metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
 2011170309 metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
-2011252124 metadata/md5-cache/dev-ml/Manifest.gz
 2011252124 metadata/md5-cache/dev-ml/batteries-2.7.0
 2011252124 metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0
 2011252124 metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1
@@ -39104,17 +39078,12 @@
 2011252124 metadata/md5-cache/dev-ml/csv-1.5
 2011252124 metadata/md5-cache/dev-ml/csv-1.6
 2011252124 metadata/md5-cache/dev-ml/csv-1.7
-2011252124 metadata/md5-cache/dev-ml/cudf-0.8-r1
 2011252124 metadata/md5-cache/dev-ml/cudf-0.9
 2011252124 metadata/md5-cache/dev-ml/deriving-0.7.1
-2011252124 metadata/md5-cache/dev-ml/dose3-5.0.1
 2011252124 metadata/md5-cache/dev-ml/eliom-6.2.0
 2011252124 metadata/md5-cache/dev-ml/eliom-9999
 2011252124 metadata/md5-cache/dev-ml/extlib-1.7.1
 2011252124 metadata/md5-cache/dev-ml/extlib-1.7.2
-2011252124 metadata/md5-cache/dev-ml/findlib-1.7.1
-2011252124 metadata/md5-cache/dev-ml/findlib-1.7.2
-2011252124 metadata/md5-cache/dev-ml/findlib-1.7.3
 2011252124 metadata/md5-cache/dev-ml/findlib-1.8.1
 2011252124 metadata/md5-cache/dev-ml/findlib-1.8.1-r1
 2011252124 metadata/md5-cache/dev-ml/gen-0.4.0.1
@@ -39126,19 +39095,14 @@
 2011252124 metadata/md5-cache/dev-ml/lablgl-1.06-r1
 2011252124 metadata/md5-cache/dev-ml/lablgtk-2.18.5
 2011252124 metadata/md5-cache/dev-ml/labltk-8.06.2
-2011252124 metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0
 2011252124 metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
 2011252124 metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0
-2011252124 metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
-2011252124 metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
 2011252124 metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1
 2011252124 metadata/md5-cache/dev-ml/lwt-3.0.0
 2011252124 metadata/md5-cache/dev-ml/lwt_react-1.0.1
 2011252124 metadata/md5-cache/dev-ml/lwt_ssl-1.0.1
 2011252124 metadata/md5-cache/dev-ml/macaque-0.7.4
 2011252124 metadata/md5-cache/dev-ml/markup-0.7.5
-2011252124 metadata/md5-cache/dev-ml/menhir-20170712
-2011252124 metadata/md5-cache/dev-ml/menhir-20171013
 2011252124 metadata/md5-cache/dev-ml/mtime-1.1.0
 2011252124 metadata/md5-cache/dev-ml/num-1.3
 2011252124 metadata/md5-cache/dev-ml/num-1.3-r1
@@ -39188,6 +39152,9 @@
 2011252124 metadata/md5-cache/dev-ml/zarith-1.10
 2011252124 metadata/md5-cache/dev-ml/zarith-1.7
 2011252124 metadata/md5-cache/dev-ml/zarith-1.9.1
+2011291209 metadata/md5-cache/dev-ml/Manifest.gz
+2011291209 metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
+2011291209 metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
 1910170740 metadata/md5-cache/dev-perl/Alien-Gnuplot-1.33.0
 1910170740 metadata/md5-cache/dev-perl/Apache-CGI-Builder-1.300.0-r2
 1910170740 metadata/md5-cache/dev-perl/Apache2-AuthenNTLM-0.20.0-r2
@@ -39978,7 +39945,6 @@
 2004151039 metadata/md5-cache/dev-perl/File-BaseDir-0.70.0
 2004151039 metadata/md5-cache/dev-perl/File-Find-Rule-0.340.0
 2004151039 metadata/md5-cache/dev-perl/File-Which-1.220.0
-2004151039 metadata/md5-cache/dev-perl/File-chdir-0.101.100
 2004151039 metadata/md5-cache/dev-perl/Probe-Perl-0.30.0
 2004151039 metadata/md5-cache/dev-perl/SUPER-1.201.411.170
 2004151039 metadata/md5-cache/dev-perl/Sub-Identify-0.140.0
@@ -40046,8 +40012,6 @@
 2005031809 metadata/md5-cache/dev-perl/Module-CPANfile-1.100.400
 2005031809 metadata/md5-cache/dev-perl/MooseX-Types-URI-0.80.0
 2005032039 metadata/md5-cache/dev-perl/Perl-Strip-1.100.0
-2005031809 metadata/md5-cache/dev-perl/Pod-Markdown-Github-0.40.0
-2005031809 metadata/md5-cache/dev-perl/Pod-Readme-1.2.3
 2005031809 metadata/md5-cache/dev-perl/URI-FromHash-0.50.0
 2005061009 metadata/md5-cache/dev-perl/Net-CIDR-0.180.0
 2005041739 metadata/md5-cache/dev-perl/Unicode-LineBreak-2019.1.0
@@ -40057,7 +40021,6 @@
 2005071709 metadata/md5-cache/dev-perl/CQL-Parser-1.130.0-r1
 2005071809 metadata/md5-cache/dev-perl/CSS-Minifier-0.10.0-r2
 2005080439 metadata/md5-cache/dev-perl/CSS-Packer-2.70.0
-2005140039 metadata/md5-cache/dev-perl/Time-Duration-1.200.0
 2005201639 metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
 2005221909 metadata/md5-cache/dev-perl/Chart-2.4.10-r1
 2005231509 metadata/md5-cache/dev-perl/Class-Adapter-1.90.0
@@ -40175,9 +40138,7 @@
 2007060609 metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.60.0
 2007060609 metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
 2007060609 metadata/md5-cache/dev-perl/XML-Grove-0.460.0_rc-r1
-2007060609 metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
 2007060609 metadata/md5-cache/dev-perl/YAML-Syck-1.310.0
-2007090609 metadata/md5-cache/dev-perl/DBD-mysql-4.50.0-r1
 2007090909 metadata/md5-cache/dev-perl/DBICx-TestDatabase-0.50.0-r1
 2007091409 metadata/md5-cache/dev-perl/SQL-Abstract-Classic-1.910.0
 2007120309 metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1
@@ -40357,7 +40318,6 @@
 2007301009 metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.5.0
 2007301039 metadata/md5-cache/dev-perl/Devel-PatchPerl-2.0.0
 2007301209 metadata/md5-cache/dev-perl/Devel-Refactor-0.50.0-r2
-2007301209 metadata/md5-cache/dev-perl/Devel-Size-0.830.0
 2007301239 metadata/md5-cache/dev-perl/Devel-StackTrace-2.40.0
 2007301239 metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0-r1
 2007301309 metadata/md5-cache/dev-perl/Device-SerialPort-1.40.0-r3
@@ -40438,7 +40398,6 @@
 2008142239 metadata/md5-cache/dev-perl/Exception-Class-1.440.0
 2008142339 metadata/md5-cache/dev-perl/Exception-System-0.110.0-r2
 2008171209 metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r2
-2008171209 metadata/md5-cache/dev-perl/Devel-Hide-0.1.300
 2008171209 metadata/md5-cache/dev-perl/Expect-1.350.0
 2008171209 metadata/md5-cache/dev-perl/FFI-CheckLib-0.250.0
 2008171209 metadata/md5-cache/dev-perl/Font-TTF-1.60.0
@@ -40466,7 +40425,6 @@
 2008211739 metadata/md5-cache/dev-perl/CGI-Application-Server-0.63.0
 2008211209 metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.15
 2008211009 metadata/md5-cache/dev-perl/FCGI-0.790.0
-2008211009 metadata/md5-cache/dev-perl/FFI-CheckLib-0.270.0
 2008211039 metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.10.0-r1
 2008211739 metadata/md5-cache/dev-perl/Feed-Find-0.70.0-r3
 2008211839 metadata/md5-cache/dev-perl/File-BOM-0.180.0
@@ -40529,12 +40487,10 @@
 2008290439 metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0-r1
 2008311739 metadata/md5-cache/dev-perl/Algorithm-Dependency-1.112.0
 2008311739 metadata/md5-cache/dev-perl/Alien-Build-2.230.0
-2008311739 metadata/md5-cache/dev-perl/Alien-Libxml2-0.160.0
 2008311739 metadata/md5-cache/dev-perl/Apache-LogFormat-Compiler-0.360.0
 2008311739 metadata/md5-cache/dev-perl/Apache-Session-1.930.0-r1
 2008311739 metadata/md5-cache/dev-perl/App-pwhich-1.160.0
 2008311739 metadata/md5-cache/dev-perl/AppConfig-1.710.0-r1
-2008311739 metadata/md5-cache/dev-perl/Archive-Zip-1.680.0
 2008311739 metadata/md5-cache/dev-perl/Array-Compare-3.0.3
 2008311739 metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r3
 2008311739 metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0-r1
@@ -40593,11 +40549,6 @@
 2009030739 metadata/md5-cache/dev-perl/DateTime-Locale-1.280.0
 2009021410 metadata/md5-cache/dev-perl/Lab-Measurement-9999
 2009021410 metadata/md5-cache/dev-perl/Lab-Zhinst-9999
-2009030739 metadata/md5-cache/dev-perl/Sort-Versions-1.620.0
-2009031339 metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
-2009031339 metadata/md5-cache/dev-perl/Import-Into-1.2.5
-2009031339 metadata/md5-cache/dev-perl/Sub-Delete-1.0.20
-2009031339 metadata/md5-cache/dev-perl/Test-Kit-2.150.0
 2009031339 metadata/md5-cache/dev-perl/Test-MockObject-1.201.612.20
 2009031339 metadata/md5-cache/dev-perl/Test-Output-1.31.0
 2009031339 metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120
@@ -40717,24 +40668,11 @@
 2010190539 metadata/md5-cache/dev-perl/Crypt-Rijndael-1.150.0
 2010190609 metadata/md5-cache/dev-perl/Curses-1.370.0
 2010220839 metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.140.0
-2010220839 metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0
 2010220839 metadata/md5-cache/dev-perl/Alien-Build-2.290.0
 2010220839 metadata/md5-cache/dev-perl/Alien-Build-2.320.0
-2010220839 metadata/md5-cache/dev-perl/Alien-Build-2.330.0
-2010220839 metadata/md5-cache/dev-perl/Archive-Extract-0.860.0
-2010220839 metadata/md5-cache/dev-perl/B-COW-0.4.0-r1
-2010220839 metadata/md5-cache/dev-perl/Clone-0.450.0
-2010220839 metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
-2010220839 metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0
-2010220839 metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0
 2010220839 metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.830.0
 2010220839 metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0-r1
-2010220839 metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0
-2010220839 metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
-2010220839 metadata/md5-cache/dev-perl/Shell-Guess-0.90.0
-2010220839 metadata/md5-cache/dev-perl/Test-File-1.443.0
 2010220839 metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0
-2010220839 metadata/md5-cache/dev-perl/Test-utf8-1.10.0
 2010260609 metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
 2010280239 metadata/md5-cache/dev-perl/Mail-Box-3.3.0
 2010280239 metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.2.0
@@ -41233,7 +41171,36 @@
 2011252124 metadata/md5-cache/dev-perl/prefork-1.40.0-r2
 2011252124 metadata/md5-cache/dev-perl/rename-1.900.0
 2011252124 metadata/md5-cache/dev-perl/txt2html-2.520.100
-2011261639 metadata/md5-cache/dev-perl/Manifest.gz
+2011281239 metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0
+2011281239 metadata/md5-cache/dev-perl/Alien-Build-2.330.0
+2011281239 metadata/md5-cache/dev-perl/Alien-Libxml2-0.160.0
+2011281239 metadata/md5-cache/dev-perl/Archive-Extract-0.860.0
+2011282239 metadata/md5-cache/dev-perl/Archive-Zip-1.680.0
+2011281309 metadata/md5-cache/dev-perl/B-COW-0.4.0-r1
+2011281309 metadata/md5-cache/dev-perl/Clone-0.450.0
+2011281309 metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
+2011281309 metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0
+2011281309 metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0
+2011281309 metadata/md5-cache/dev-perl/DBD-mysql-4.50.0-r1
+2011281239 metadata/md5-cache/dev-perl/Devel-Hide-0.1.300
+2011281209 metadata/md5-cache/dev-perl/Devel-Size-0.830.0
+2011281239 metadata/md5-cache/dev-perl/FFI-CheckLib-0.270.0
+2011281309 metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0
+2011281239 metadata/md5-cache/dev-perl/File-chdir-0.101.100
+2011281309 metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
+2011281309 metadata/md5-cache/dev-perl/Import-Into-1.2.5
+2011282239 metadata/md5-cache/dev-perl/Manifest.gz
+2011281309 metadata/md5-cache/dev-perl/Pod-Markdown-Github-0.40.0
+2011281309 metadata/md5-cache/dev-perl/Pod-Readme-1.2.3
+2011281239 metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
+2011281239 metadata/md5-cache/dev-perl/Shell-Guess-0.90.0
+2011281239 metadata/md5-cache/dev-perl/Sort-Versions-1.620.0
+2011281309 metadata/md5-cache/dev-perl/Sub-Delete-1.0.20
+2011281309 metadata/md5-cache/dev-perl/Test-File-1.443.0
+2011281309 metadata/md5-cache/dev-perl/Test-Kit-2.150.0
+2011281309 metadata/md5-cache/dev-perl/Test-utf8-1.10.0
+2011281239 metadata/md5-cache/dev-perl/Time-Duration-1.200.0
+2011281239 metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
 1811020409 metadata/md5-cache/dev-php/File_Iterator-1.3.4
 1908161609 metadata/md5-cache/dev-php/PEAR-Config-2.0.0_pre20140323-r1
 1811020409 metadata/md5-cache/dev-php/PEAR-DB_DataObject-1.11.5-r1
@@ -41644,7 +41611,6 @@
 2011261639 metadata/md5-cache/dev-php/pecl-zmq-9999
 2005091439 metadata/md5-cache/dev-python/nltk-data-20200312-r1
 2007080039 metadata/md5-cache/dev-python/python-docs-2.7.18
-2008222139 metadata/md5-cache/dev-python/python-docs-3.8.5
 2008292109 metadata/md5-cache/dev-python/pypy-exe-bin-7.3.1_p1
 2008302339 metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.1_p1
 2009261709 metadata/md5-cache/dev-python/pypy-exe-bin-7.3.2
@@ -41652,7 +41618,6 @@
 2010050039 metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.2_p37-r1
 2010220209 metadata/md5-cache/dev-python/python-docs-3.6.12
 2010220209 metadata/md5-cache/dev-python/python-docs-3.7.9
-2010220209 metadata/md5-cache/dev-python/python-docs-3.8.6
 2010220209 metadata/md5-cache/dev-python/python-docs-3.9.0
 2011131509 metadata/md5-cache/dev-python/pypy-exe-bin-7.3.3_rc1
 2011131509 metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.3_rc1
@@ -41674,13 +41639,7 @@
 2011252124 metadata/md5-cache/dev-python/PyGithub-1.53
 2011252124 metadata/md5-cache/dev-python/PyICU-2.5
 2011252124 metadata/md5-cache/dev-python/PyPDF2-1.26.0
-2011252124 metadata/md5-cache/dev-python/PyQt5-5.14.2-r1
-2011252124 metadata/md5-cache/dev-python/PyQt5-5.15.0-r1
-2011252124 metadata/md5-cache/dev-python/PyQt5-sip-4.19.22-r1
-2011252124 metadata/md5-cache/dev-python/PyQt5-sip-4.19.23-r1
 2011252124 metadata/md5-cache/dev-python/PyQt5-sip-4.19.24
-2011252124 metadata/md5-cache/dev-python/PyQtWebEngine-5.14.0
-2011252124 metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1_pre2006110847
 2011252124 metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r1
 2011252124 metadata/md5-cache/dev-python/PySDL2-0.9.7
 2011252124 metadata/md5-cache/dev-python/PySensors-0.0.4
@@ -41741,13 +41700,11 @@
 2011252124 metadata/md5-cache/dev-python/atpublic-1.0
 2011252124 metadata/md5-cache/dev-python/attrs-20.1.0-r1
 2011252124 metadata/md5-cache/dev-python/attrs-20.2.0-r1
-2011252124 metadata/md5-cache/dev-python/attrs-20.3.0
 2011252124 metadata/md5-cache/dev-python/audioread-2.1.8-r2
 2011252124 metadata/md5-cache/dev-python/authheaders-0.13.0
 2011252124 metadata/md5-cache/dev-python/authres-1.2.0
 2011252124 metadata/md5-cache/dev-python/autobahn-20.4.3
 2011252124 metadata/md5-cache/dev-python/autobahn-20.7.1
-2011252124 metadata/md5-cache/dev-python/automat-20.2.0
 2011252124 metadata/md5-cache/dev-python/automaton-1.12.1
 2011252124 metadata/md5-cache/dev-python/autopep8-1.5.4
 2011252124 metadata/md5-cache/dev-python/autopep8-9999
@@ -41775,9 +41732,7 @@
 2011252124 metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
 2011252124 metadata/md5-cache/dev-python/bcrypt-3.2.0
 2011252124 metadata/md5-cache/dev-python/beagle-0.3.0
-2011252124 metadata/md5-cache/dev-python/beautifulsoup-4.9.3
 2011252124 metadata/md5-cache/dev-python/bert-2.2.0
-2011252124 metadata/md5-cache/dev-python/betamax-0.8.1
 2011252124 metadata/md5-cache/dev-python/betamax-matchers-0.4.0
 2011252124 metadata/md5-cache/dev-python/bibtexparser-1.1.0
 2011252124 metadata/md5-cache/dev-python/billiard-3.6.0.0
@@ -41785,10 +41740,8 @@
 2011252124 metadata/md5-cache/dev-python/bitarray-0.8.3
 2011252124 metadata/md5-cache/dev-python/bitarray-1.6.1
 2011252124 metadata/md5-cache/dev-python/bitstring-3.1.7
-2011252124 metadata/md5-cache/dev-python/bleach-3.2.1
 2011252124 metadata/md5-cache/dev-python/blessed-1.17.11
 2011252124 metadata/md5-cache/dev-python/blessings-1.7-r1
-2011252124 metadata/md5-cache/dev-python/blinker-1.4-r2
 2011252124 metadata/md5-cache/dev-python/blosc-1.9.2
 2011252124 metadata/md5-cache/dev-python/bluelet-0.2.0
 2011252124 metadata/md5-cache/dev-python/blurb-1.0.7
@@ -41819,7 +41772,6 @@
 2011252124 metadata/md5-cache/dev-python/braintree-4.4.0
 2011252124 metadata/md5-cache/dev-python/breathe-4.14.1
 2011252124 metadata/md5-cache/dev-python/breathe-4.22.1
-2011252124 metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
 2011252124 metadata/md5-cache/dev-python/brython-3.7.3
 2011252124 metadata/md5-cache/dev-python/brython-3.7.4
 2011252124 metadata/md5-cache/dev-python/bsddb3-6.2.7
@@ -41833,7 +41785,6 @@
 2011252124 metadata/md5-cache/dev-python/carbon-1.1.5
 2011252124 metadata/md5-cache/dev-python/case-1.5.3
 2011252124 metadata/md5-cache/dev-python/castellan-1.2.2
-2011252124 metadata/md5-cache/dev-python/castellan-3.6.0
 2011252124 metadata/md5-cache/dev-python/casttube-0.2.0
 2011252124 metadata/md5-cache/dev-python/catkin_pkg-0.4.23
 2011252124 metadata/md5-cache/dev-python/catkin_pkg-9999
@@ -41843,14 +41794,12 @@
 2011252124 metadata/md5-cache/dev-python/celery-4.3.0
 2011252124 metadata/md5-cache/dev-python/certifi-10001
 2011252124 metadata/md5-cache/dev-python/certifi-10001-r1
-2011252124 metadata/md5-cache/dev-python/cffi-1.14.0-r3
 2011252124 metadata/md5-cache/dev-python/cfn-python-lint-0.41.0
 2011252124 metadata/md5-cache/dev-python/cfn-python-lint-0.42.0
 2011252124 metadata/md5-cache/dev-python/cgroup-utils-0.8
 2011252124 metadata/md5-cache/dev-python/chai-1.1.2
 2011252124 metadata/md5-cache/dev-python/chainmap-1.0.3
 2011252124 metadata/md5-cache/dev-python/chameleon-3.8.1
-2011252124 metadata/md5-cache/dev-python/characteristic-14.3.0-r3
 2011252124 metadata/md5-cache/dev-python/chardet-3.0.4-r1
 2011252124 metadata/md5-cache/dev-python/chart-studio-1.1.0
 2011252124 metadata/md5-cache/dev-python/cheetah-2.4.4-r1
@@ -41864,16 +41813,12 @@
 2011252124 metadata/md5-cache/dev-python/chump-1.6.0-r1
 2011252124 metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
 2011252124 metadata/md5-cache/dev-python/cjkwrap-2.2-r1
-2011252124 metadata/md5-cache/dev-python/clang-python-10.0.0
 2011252124 metadata/md5-cache/dev-python/clang-python-10.0.1
 2011252124 metadata/md5-cache/dev-python/clang-python-11.0.0
-2011252124 metadata/md5-cache/dev-python/clang-python-11.0.0.9999
-2011252124 metadata/md5-cache/dev-python/clang-python-12.0.0.9999
 2011252124 metadata/md5-cache/dev-python/clang-python-9.0.1
 2011252124 metadata/md5-cache/dev-python/cli_helpers-2.1.0
 2011252124 metadata/md5-cache/dev-python/cli_helpers-9999
 2011252124 metadata/md5-cache/dev-python/click-6.7-r2
-2011252124 metadata/md5-cache/dev-python/click-7.1.2-r1
 2011252124 metadata/md5-cache/dev-python/click-default-group-1.2.2
 2011252124 metadata/md5-cache/dev-python/click-log-0.3.2
 2011252124 metadata/md5-cache/dev-python/click-plugins-1.0.3
@@ -41902,9 +41847,7 @@
 2011252124 metadata/md5-cache/dev-python/confuse-1.0.0
 2011252124 metadata/md5-cache/dev-python/confuse-1.4.0
 2011252124 metadata/md5-cache/dev-python/consonance-0.1.3-r1
-2011252124 metadata/md5-cache/dev-python/constantly-15.1.0-r1
 2011252124 metadata/md5-cache/dev-python/construct-2.10.56
-2011252124 metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1
 2011252124 metadata/md5-cache/dev-python/contextvars-2.4
 2011252124 metadata/md5-cache/dev-python/cookies-2.2.1-r1
 2011252124 metadata/md5-cache/dev-python/coreapi-2.3.3-r1
@@ -41912,18 +41855,15 @@
 2011252124 metadata/md5-cache/dev-python/couchdb-python-1.1
 2011252124 metadata/md5-cache/dev-python/cov-core-1.15.0-r2
 2011252124 metadata/md5-cache/dev-python/coverage-4.5.4
-2011252124 metadata/md5-cache/dev-python/coverage-5.3
 2011252124 metadata/md5-cache/dev-python/cppy-1.1.0
 2011252124 metadata/md5-cache/dev-python/crcmod-1.7-r4
 2011252124 metadata/md5-cache/dev-python/croniter-0.3.30
 2011252124 metadata/md5-cache/dev-python/cryptography-3.2
 2011252124 metadata/md5-cache/dev-python/cryptography-3.2.1
 2011252124 metadata/md5-cache/dev-python/css-parser-1.0.4-r1
-2011252124 metadata/md5-cache/dev-python/cssselect-1.1.0-r1
 2011252124 metadata/md5-cache/dev-python/cssselect2-0.3.0
 2011252124 metadata/md5-cache/dev-python/cssselect2-0.4.1
 2011252124 metadata/md5-cache/dev-python/cssutils-1.0.2-r2
-2011252124 metadata/md5-cache/dev-python/csv23-0.3.2-r1
 2011252124 metadata/md5-cache/dev-python/ctypescrypto-0.5
 2011252124 metadata/md5-cache/dev-python/ctypescrypto-9999
 2011252124 metadata/md5-cache/dev-python/ctypesgen-1.0.2
@@ -41960,7 +41900,6 @@
 2011252124 metadata/md5-cache/dev-python/diskcache-5.0.3
 2011252124 metadata/md5-cache/dev-python/diskcache-5.1.0
 2011252124 metadata/md5-cache/dev-python/dissononce-0.34.3-r1
-2011252124 metadata/md5-cache/dev-python/distlib-0.3.1-r1
 2011252124 metadata/md5-cache/dev-python/distro-1.5.0-r1
 2011252124 metadata/md5-cache/dev-python/dj-database-url-0.5.0
 2011252124 metadata/md5-cache/dev-python/django-2.2.16
@@ -42034,13 +41973,11 @@
 2011252124 metadata/md5-cache/dev-python/elasticsearch-curator-5.8.1-r1
 2011252124 metadata/md5-cache/dev-python/elasticsearch-py-7.7.0
 2011252124 metadata/md5-cache/dev-python/elementpath-2.0.3
-2011252124 metadata/md5-cache/dev-python/elementpath-2.0.4
 2011252124 metadata/md5-cache/dev-python/emcee-3.0.2
 2011252124 metadata/md5-cache/dev-python/emoji-0.5.4
 2011252124 metadata/md5-cache/dev-python/empy-3.3.4
 2011252124 metadata/md5-cache/dev-python/entrypoint2-0.2.1
 2011252124 metadata/md5-cache/dev-python/entrypoint2-0.2.3
-2011252124 metadata/md5-cache/dev-python/entrypoints-0.3-r2
 2011252124 metadata/md5-cache/dev-python/enzyme-0.4.1-r2
 2011252124 metadata/md5-cache/dev-python/enzyme-9999
 2011252124 metadata/md5-cache/dev-python/eradicate-2.0.0
@@ -42049,7 +41986,6 @@
 2011252124 metadata/md5-cache/dev-python/eventlet-0.26.1
 2011252124 metadata/md5-cache/dev-python/exam-0.10.6
 2011252124 metadata/md5-cache/dev-python/exdown-0.7.0
-2011252124 metadata/md5-cache/dev-python/execnet-1.7.1-r1
 2011252124 metadata/md5-cache/dev-python/executing-0.5.3
 2011252124 metadata/md5-cache/dev-python/expects-0.9.0
 2011252124 metadata/md5-cache/dev-python/extras-1.0.0-r1
@@ -42064,18 +42000,13 @@
 2011252124 metadata/md5-cache/dev-python/feedparser-5.2.1
 2011252124 metadata/md5-cache/dev-python/fido2-0.7.3
 2011252124 metadata/md5-cache/dev-python/fido2-0.8.1
-2011252124 metadata/md5-cache/dev-python/fields-5.0.0-r2
-2011252124 metadata/md5-cache/dev-python/filelock-3.0.12-r1
 2011252124 metadata/md5-cache/dev-python/filetype-1.0.7
 2011252124 metadata/md5-cache/dev-python/findimports-1.5.2
 2011252124 metadata/md5-cache/dev-python/fitsio-0.9.11
 2011252124 metadata/md5-cache/dev-python/fixtures-3.0.0-r1
 2011252124 metadata/md5-cache/dev-python/flake8-3.8.1
-2011252124 metadata/md5-cache/dev-python/flake8-3.8.3-r1
 2011252124 metadata/md5-cache/dev-python/flake8-import-order-0.18
 2011252124 metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
-2011252124 metadata/md5-cache/dev-python/flaky-3.7.0-r1
-2011252124 metadata/md5-cache/dev-python/flask-1.1.2-r1
 2011252124 metadata/md5-cache/dev-python/flask-9999
 2011252124 metadata/md5-cache/dev-python/flask-api-2.0
 2011252124 metadata/md5-cache/dev-python/flask-assets-0.12
@@ -42133,9 +42064,7 @@
 2011252124 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
 2011252124 metadata/md5-cache/dev-python/genshi-0.7.3-r1
 2011252124 metadata/md5-cache/dev-python/genson-1.1.0
-2011252124 metadata/md5-cache/dev-python/genty-1.3.2-r1
 2011252124 metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
-2011252124 metadata/md5-cache/dev-python/gevent-20.9.0
 2011252124 metadata/md5-cache/dev-python/gevent-websocket-0.10.1
 2011252124 metadata/md5-cache/dev-python/geventhttpclient-1.4.4-r1
 2011252124 metadata/md5-cache/dev-python/git-review-1.28.0
@@ -42145,7 +42074,6 @@
 2011252124 metadata/md5-cache/dev-python/glance_store-1.0.1
 2011252124 metadata/md5-cache/dev-python/glance_store-2.3.0
 2011252124 metadata/md5-cache/dev-python/glooey-0.3.4
-2011252124 metadata/md5-cache/dev-python/gmpy-2.0.8-r2
 2011252124 metadata/md5-cache/dev-python/google-api-core-1.17.0
 2011252124 metadata/md5-cache/dev-python/google-api-python-client-1.8.3-r1
 2011252124 metadata/md5-cache/dev-python/google-apitools-0.5.31
@@ -42160,7 +42088,6 @@
 2011252124 metadata/md5-cache/dev-python/graph-tool-9999
 2011252124 metadata/md5-cache/dev-python/graphviz-0.14.2
 2011252124 metadata/md5-cache/dev-python/graphviz-0.15
-2011252124 metadata/md5-cache/dev-python/greenlet-0.4.17
 2011252124 metadata/md5-cache/dev-python/greenstalk-1.0.1
 2011252124 metadata/md5-cache/dev-python/grpcio-1.28.1
 2011252124 metadata/md5-cache/dev-python/grpcio-1.32.0-r1
@@ -42188,7 +42115,6 @@
 2011252124 metadata/md5-cache/dev-python/httmock-1.2.5
 2011252124 metadata/md5-cache/dev-python/http-parser-0.9.0
 2011252124 metadata/md5-cache/dev-python/httpauth-0.3
-2011252124 metadata/md5-cache/dev-python/httpbin-0.7.0-r1
 2011252124 metadata/md5-cache/dev-python/httplib2-0.18.1-r1
 2011252124 metadata/md5-cache/dev-python/httpretty-0.9.6
 2011252124 metadata/md5-cache/dev-python/httpretty-1.0.2-r1
@@ -42199,7 +42125,6 @@
 2011252124 metadata/md5-cache/dev-python/hyper-h2-4.0.0
 2011252124 metadata/md5-cache/dev-python/hyperframe-5.2.0
 2011252124 metadata/md5-cache/dev-python/hyperframe-6.0.0
-2011252124 metadata/md5-cache/dev-python/hyperlink-20.0.1
 2011252124 metadata/md5-cache/dev-python/hypothesis-5.24.4
 2011252124 metadata/md5-cache/dev-python/hypothesis-5.35.4
 2011252124 metadata/md5-cache/dev-python/hypothesis-5.36.2
@@ -42220,14 +42145,10 @@
 2011252124 metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r2
 2011252124 metadata/md5-cache/dev-python/importlib_metadata-2.0.0
 2011252124 metadata/md5-cache/dev-python/importlib_metadata-3.0.0
-2011252124 metadata/md5-cache/dev-python/importlib_metadata-3.1.0
 2011252124 metadata/md5-cache/dev-python/importlib_resources-1.5.0-r2
-2011252124 metadata/md5-cache/dev-python/importlib_resources-3.3.0
 2011252124 metadata/md5-cache/dev-python/imread-0.7.3
-2011252124 metadata/md5-cache/dev-python/incremental-17.5.0
 2011252124 metadata/md5-cache/dev-python/indexed_gzip-0.8.10
 2011252124 metadata/md5-cache/dev-python/inflect-4.1.0
-2011252124 metadata/md5-cache/dev-python/inflect-5.0.2
 2011252124 metadata/md5-cache/dev-python/inflection-0.5.1
 2011252124 metadata/md5-cache/dev-python/influxdb-5.3.0-r1
 2011252124 metadata/md5-cache/dev-python/iniparse-0.4-r2
@@ -42256,15 +42177,9 @@
 2011252124 metadata/md5-cache/dev-python/isodate-0.6.0-r1
 2011252124 metadata/md5-cache/dev-python/isort-4.3.15
 2011252124 metadata/md5-cache/dev-python/isort-4.3.21_p2-r1
-2011252124 metadata/md5-cache/dev-python/isort-5.6.3
-2011252124 metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
 2011252124 metadata/md5-cache/dev-python/itypes-1.1.0
-2011252124 metadata/md5-cache/dev-python/jaraco-classes-3.1.0
 2011252124 metadata/md5-cache/dev-python/jaraco-collections-3.0.0
 2011252124 metadata/md5-cache/dev-python/jaraco-context-3.0.0
-2011252124 metadata/md5-cache/dev-python/jaraco-envs-2.0.0
-2011252124 metadata/md5-cache/dev-python/jaraco-functools-3.0.1
-2011252124 metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
 2011252124 metadata/md5-cache/dev-python/jaraco-logging-3.0.0-r1
 2011252124 metadata/md5-cache/dev-python/jaraco-packaging-8.1.0-r1
 2011252124 metadata/md5-cache/dev-python/jaraco-packaging-8.1.1
@@ -42275,7 +42190,6 @@
 2011252124 metadata/md5-cache/dev-python/jedi-0.17.2-r1
 2011252124 metadata/md5-cache/dev-python/jeepney-0.4.3
 2011252124 metadata/md5-cache/dev-python/jeepney-0.5.0
-2011252124 metadata/md5-cache/dev-python/jeepney-0.6.0
 2011252124 metadata/md5-cache/dev-python/jellyfish-0.8.2
 2011252124 metadata/md5-cache/dev-python/jikanpy-4.2.1
 2011252124 metadata/md5-cache/dev-python/jinja-2.11.2-r1
@@ -42317,10 +42231,7 @@
 2011252124 metadata/md5-cache/dev-python/keep-2.10
 2011252124 metadata/md5-cache/dev-python/keep-2.9
 2011252124 metadata/md5-cache/dev-python/keyring-21.4.0
-2011252124 metadata/md5-cache/dev-python/keyring-21.5.0
 2011252124 metadata/md5-cache/dev-python/keystoneauth-4.2.1
-2011252124 metadata/md5-cache/dev-python/keystonemiddleware-7.0.1
-2011252124 metadata/md5-cache/dev-python/keystonemiddleware-9.1.0
 2011252124 metadata/md5-cache/dev-python/kiwisolver-1.3.1
 2011252124 metadata/md5-cache/dev-python/klein-20.6.0
 2011252124 metadata/md5-cache/dev-python/kombu-4.6.8
@@ -42352,11 +42263,8 @@
 2011252124 metadata/md5-cache/dev-python/libvirt-python-9999
 2011252124 metadata/md5-cache/dev-python/line_profiler-3.0.2
 2011252124 metadata/md5-cache/dev-python/linecache2-1.0.0-r1
-2011252124 metadata/md5-cache/dev-python/lit-10.0.0
 2011252124 metadata/md5-cache/dev-python/lit-10.0.1
 2011252124 metadata/md5-cache/dev-python/lit-11.0.0
-2011252124 metadata/md5-cache/dev-python/lit-11.0.0.9999
-2011252124 metadata/md5-cache/dev-python/lit-12.0.0.9999
 2011252124 metadata/md5-cache/dev-python/lit-9.0.1
 2011252124 metadata/md5-cache/dev-python/livereload-2.6.1
 2011252124 metadata/md5-cache/dev-python/llfuse-1.3.6
@@ -42375,7 +42283,6 @@
 2011252124 metadata/md5-cache/dev-python/lz4-3.1.1
 2011252124 metadata/md5-cache/dev-python/m2crypto-0.35.2-r1
 2011252124 metadata/md5-cache/dev-python/m2crypto-0.36.0-r1
-2011252124 metadata/md5-cache/dev-python/m2r-0.2.1
 2011252124 metadata/md5-cache/dev-python/mako-1.1.3-r1
 2011252124 metadata/md5-cache/dev-python/mamba-0.11.1
 2011252124 metadata/md5-cache/dev-python/mando-0.6.4
@@ -42407,7 +42314,6 @@
 2011252124 metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
 2011252124 metadata/md5-cache/dev-python/miniupnpc-2.2.0
 2011252124 metadata/md5-cache/dev-python/misaka-2.1.1
-2011252124 metadata/md5-cache/dev-python/mistune-0.8.4-r1
 2011252124 metadata/md5-cache/dev-python/mkautodoc-0.1.0
 2011252124 metadata/md5-cache/dev-python/mkdocs-1.1
 2011252124 metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1
@@ -42416,10 +42322,7 @@
 2011252124 metadata/md5-cache/dev-python/mock-3.0.5-r2
 2011252124 metadata/md5-cache/dev-python/mongoengine-0.20.0
 2011252124 metadata/md5-cache/dev-python/mongoengine-0.21.0
-2011252124 metadata/md5-cache/dev-python/monotonic-1.5-r1
-2011252124 metadata/md5-cache/dev-python/more-itertools-5.0.0-r1
 2011252124 metadata/md5-cache/dev-python/more-itertools-8.5.0
-2011252124 metadata/md5-cache/dev-python/more-itertools-8.6.0
 2011252124 metadata/md5-cache/dev-python/moto-1.3.14-r3
 2011252124 metadata/md5-cache/dev-python/moto-1.3.16-r1
 2011252124 metadata/md5-cache/dev-python/moviepy-1.0.1-r1
@@ -42430,8 +42333,6 @@
 2011252124 metadata/md5-cache/dev-python/msgpack-0.6.2
 2011252124 metadata/md5-cache/dev-python/msgpack-1.0.0
 2011252124 metadata/md5-cache/dev-python/mss-6.0.0
-2011252124 metadata/md5-cache/dev-python/multidict-5.0.0
-2011252124 metadata/md5-cache/dev-python/munch-2.5.0-r1
 2011252124 metadata/md5-cache/dev-python/munkres-1.1.2
 2011252124 metadata/md5-cache/dev-python/mygpoclient-1.8
 2011252124 metadata/md5-cache/dev-python/mypy-0.782
@@ -42439,8 +42340,6 @@
 2011252124 metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
 2011252124 metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
 2011252124 metadata/md5-cache/dev-python/namespace-google-1-r1
-2011252124 metadata/md5-cache/dev-python/namespace-jaraco-2-r2
-2011252124 metadata/md5-cache/dev-python/namespace-paste-1-r1
 2011252124 metadata/md5-cache/dev-python/namespace-repoze-1
 2011252124 metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
 2011252124 metadata/md5-cache/dev-python/namespace-zope-1-r1
@@ -42456,7 +42355,6 @@
 2011252124 metadata/md5-cache/dev-python/nbval-0.9.1-r1
 2011252124 metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
 2011252124 metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
-2011252124 metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
 2011252124 metadata/md5-cache/dev-python/neovim-remote-2.4.0
 2011252124 metadata/md5-cache/dev-python/neovim-remote-9999
 2011252124 metadata/md5-cache/dev-python/nest_asyncio-1.4.3
@@ -42517,7 +42415,6 @@
 2011252124 metadata/md5-cache/dev-python/ordered-set-4.0.2
 2011252124 metadata/md5-cache/dev-python/os-brick-2.8.2
 2011252124 metadata/md5-cache/dev-python/os-brick-3.0.1
-2011252124 metadata/md5-cache/dev-python/os-brick-4.0.1
 2011252124 metadata/md5-cache/dev-python/os-client-config-2.1.0
 2011252124 metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3
 2011252124 metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
@@ -42570,14 +42467,9 @@
 2011252124 metadata/md5-cache/dev-python/parso-0.8.0
 2011252124 metadata/md5-cache/dev-python/partd-1.1.0
 2011252124 metadata/md5-cache/dev-python/parver-0.3.1
-2011252124 metadata/md5-cache/dev-python/passlib-1.7.4
 2011252124 metadata/md5-cache/dev-python/paste-3.5.0
-2011252124 metadata/md5-cache/dev-python/pastedeploy-2.1.1
 2011252124 metadata/md5-cache/dev-python/patch-ng-1.17.4
 2011252124 metadata/md5-cache/dev-python/path-and-address-2.0.1
-2011252124 metadata/md5-cache/dev-python/path-py-15.0.0
-2011252124 metadata/md5-cache/dev-python/pathlib2-2.3.5-r1
-2011252124 metadata/md5-cache/dev-python/pathspec-0.8.0
 2011252124 metadata/md5-cache/dev-python/pathtools-0.1.2-r3
 2011252124 metadata/md5-cache/dev-python/patsy-0.5.1
 2011252124 metadata/md5-cache/dev-python/pbkdf2-1.3-r1
@@ -42606,11 +42498,9 @@
 2011252124 metadata/md5-cache/dev-python/pipenv-2020.8.13
 2011252124 metadata/md5-cache/dev-python/pipfile-0.0.2
 2011252124 metadata/md5-cache/dev-python/pkgconfig-1.5.1
-2011252124 metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1
 2011252124 metadata/md5-cache/dev-python/plotly-1.9.6
 2011252124 metadata/md5-cache/dev-python/plotly-4.10.0
 2011252124 metadata/md5-cache/dev-python/plotly-geo-1.0.0
-2011252124 metadata/md5-cache/dev-python/pluggy-0.13.1-r1
 2011252124 metadata/md5-cache/dev-python/pluginbase-1.0.0
 2011252124 metadata/md5-cache/dev-python/plumbum-1.6.8
 2011252124 metadata/md5-cache/dev-python/ply-3.11-r1
@@ -42625,7 +42515,6 @@
 2011252124 metadata/md5-cache/dev-python/pony-0.7.14
 2011252124 metadata/md5-cache/dev-python/pooch-1.2.0
 2011252124 metadata/md5-cache/dev-python/portend-2.6
-2011252124 metadata/md5-cache/dev-python/portend-2.7.0
 2011252124 metadata/md5-cache/dev-python/poyo-0.5.0
 2011252124 metadata/md5-cache/dev-python/precis-i18n-1.0.2
 2011252124 metadata/md5-cache/dev-python/pretend-1.0.9-r1
@@ -42633,7 +42522,6 @@
 2011252124 metadata/md5-cache/dev-python/prettytable-0.7.2-r1
 2011252124 metadata/md5-cache/dev-python/prettytable-2.0.0
 2011252124 metadata/md5-cache/dev-python/priority-1.3.0
-2011252124 metadata/md5-cache/dev-python/process-tests-2.1.1
 2011252124 metadata/md5-cache/dev-python/progress-1.5
 2011252124 metadata/md5-cache/dev-python/progressbar-2.5
 2011252124 metadata/md5-cache/dev-python/progressbar2-3.39.3
@@ -42654,7 +42542,6 @@
 2011252124 metadata/md5-cache/dev-python/psycopg-2.8.6-r1
 2011252124 metadata/md5-cache/dev-python/ptpython-2.0.6
 2011252124 metadata/md5-cache/dev-python/ptvsd-4.3.2
-2011252124 metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1
 2011252124 metadata/md5-cache/dev-python/publicsuffix-2.20191221
 2011252124 metadata/md5-cache/dev-python/pudb-2019.2
 2011252124 metadata/md5-cache/dev-python/pure-sasl-0.6.1
@@ -42674,11 +42561,9 @@
 2011252124 metadata/md5-cache/dev-python/pyGPG-9999
 2011252124 metadata/md5-cache/dev-python/pyTenable-1.1.3
 2011252124 metadata/md5-cache/dev-python/pyacoustid-1.2.0
-2011252124 metadata/md5-cache/dev-python/pyaes-1.6.1-r2
 2011252124 metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
 2011252124 metadata/md5-cache/dev-python/pyamg-3.2.1-r1
 2011252124 metadata/md5-cache/dev-python/pyasn1-0.4.8-r1
-2011252124 metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
 2011252124 metadata/md5-cache/dev-python/pyatspi-2.36.0
 2011252124 metadata/md5-cache/dev-python/pyaudio-0.2.11-r1
 2011252124 metadata/md5-cache/dev-python/pybind11-2.5.0
@@ -42716,7 +42601,6 @@
 2011252124 metadata/md5-cache/dev-python/pydiff-0.2-r1
 2011252124 metadata/md5-cache/dev-python/pydispatcher-2.1.2
 2011252124 metadata/md5-cache/dev-python/pydns-3.2.1
-2011252124 metadata/md5-cache/dev-python/pydocstyle-5.1.1
 2011252124 metadata/md5-cache/dev-python/pydot-1.4.1
 2011252124 metadata/md5-cache/dev-python/pydotplus-2.0.2
 2011252124 metadata/md5-cache/dev-python/pyelftools-0.26
@@ -42753,7 +42637,6 @@
 2011252124 metadata/md5-cache/dev-python/pygraphviz-1.6
 2011252124 metadata/md5-cache/dev-python/pygresql-5.2
 2011252124 metadata/md5-cache/dev-python/pyh2o-1
-2011252124 metadata/md5-cache/dev-python/pyhamcrest-2.0.2
 2011252124 metadata/md5-cache/dev-python/pyilmbase-2.5.2-r1
 2011252124 metadata/md5-cache/dev-python/pyinotify-0.9.6
 2011252124 metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
@@ -42761,7 +42644,6 @@
 2011252124 metadata/md5-cache/dev-python/pykerberos-1.3.0-r1
 2011252124 metadata/md5-cache/dev-python/pykka-2.0.2
 2011252124 metadata/md5-cache/dev-python/pykwalify-1.7.0
-2011252124 metadata/md5-cache/dev-python/pylama-7.7.1-r1
 2011252124 metadata/md5-cache/dev-python/pylast-4.0.0
 2011252124 metadata/md5-cache/dev-python/pylatex-1.4.0
 2011252124 metadata/md5-cache/dev-python/pylatex-1.4.1
@@ -42809,14 +42691,10 @@
 2011252124 metadata/md5-cache/dev-python/pyperclip-1.7.0
 2011252124 metadata/md5-cache/dev-python/pyphen-0.10.0
 2011252124 metadata/md5-cache/dev-python/pyphen-0.9.5
-2011252124 metadata/md5-cache/dev-python/pypiserver-1.4.2
 2011252124 metadata/md5-cache/dev-python/pypng-0.0.20
-2011252124 metadata/md5-cache/dev-python/pypowervm-1.1.20
-2011252124 metadata/md5-cache/dev-python/pypowervm-1.1.24
 2011252124 metadata/md5-cache/dev-python/pyprof2calltree-1.4.4
 2011252124 metadata/md5-cache/dev-python/pyproj-2.6.1_p1
 2011252124 metadata/md5-cache/dev-python/pyproject2setuppy-8
-2011252124 metadata/md5-cache/dev-python/pyproject2setuppy-9
 2011252124 metadata/md5-cache/dev-python/pypugjs-5.9.5
 2011252124 metadata/md5-cache/dev-python/pypy-7.3.1-r3
 2011252124 metadata/md5-cache/dev-python/pypy-7.3.2
@@ -42844,7 +42722,6 @@
 2011252124 metadata/md5-cache/dev-python/pyqt-distutils-0.7.3
 2011252124 metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0
 2011252124 metadata/md5-cache/dev-python/pyquery-1.4.1-r1
-2011252124 metadata/md5-cache/dev-python/pyquery-1.4.3
 2011252124 metadata/md5-cache/dev-python/pyre2-1.0.7
 2011252124 metadata/md5-cache/dev-python/pyrfc3339-1.1
 2011252124 metadata/md5-cache/dev-python/pyro-4.80
@@ -42854,7 +42731,6 @@
 2011252124 metadata/md5-cache/dev-python/pyscard-1.9.9
 2011252124 metadata/md5-cache/dev-python/pyscreenshot-2.2
 2011252124 metadata/md5-cache/dev-python/pyserial-3.4
-2011252124 metadata/md5-cache/dev-python/pyserial-3.5
 2011252124 metadata/md5-cache/dev-python/pyside2-5.15.1
 2011252124 metadata/md5-cache/dev-python/pysmi-0.3.4
 2011252124 metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
@@ -42871,8 +42747,6 @@
 2011252124 metadata/md5-cache/dev-python/pyte-0.8.0-r1
 2011252124 metadata/md5-cache/dev-python/pytest-4.6.11-r1
 2011252124 metadata/md5-cache/dev-python/pytest-5.4.3
-2011252124 metadata/md5-cache/dev-python/pytest-6.1.2
-2011252124 metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
 2011252124 metadata/md5-cache/dev-python/pytest-cache-1.0-r2
 2011252124 metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
 2011252124 metadata/md5-cache/dev-python/pytest-cov-2.8.1
@@ -42885,14 +42759,10 @@
 2011252124 metadata/md5-cache/dev-python/pytest-flake8-0.9.1
 2011252124 metadata/md5-cache/dev-python/pytest-flakes-4.0.0
 2011252124 metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
-2011252124 metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
 2011252124 metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
 2011252124 metadata/md5-cache/dev-python/pytest-html-1.22.1
-2011252124 metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
 2011252124 metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
-2011252124 metadata/md5-cache/dev-python/pytest-localserver-0.5.0
 2011252124 metadata/md5-cache/dev-python/pytest-metadata-1.8.0
-2011252124 metadata/md5-cache/dev-python/pytest-mock-3.3.1
 2011252124 metadata/md5-cache/dev-python/pytest-ordering-0.6
 2011252124 metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
 2011252124 metadata/md5-cache/dev-python/pytest-pylint-0.17.0
@@ -42912,7 +42782,6 @@
 2011252124 metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1
 2011252124 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
 2011252124 metadata/md5-cache/dev-python/pytest-xdist-1.34.0-r1
-2011252124 metadata/md5-cache/dev-python/pytest-xdist-2.1.0
 2011252124 metadata/md5-cache/dev-python/pytest-xprocess-0.15.0
 2011252124 metadata/md5-cache/dev-python/pytest-xprocess-0.16.0
 2011252124 metadata/md5-cache/dev-python/pytest-xvfb-2.0.0
@@ -43055,7 +42924,6 @@
 2011252124 metadata/md5-cache/dev-python/ratelimit-1.4.1
 2011252124 metadata/md5-cache/dev-python/rcssmin-1.0.6
 2011252124 metadata/md5-cache/dev-python/rdflib-5.0.0
-2011252124 metadata/md5-cache/dev-python/re-assert-1.1.0
 2011252124 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.1
 2011252124 metadata/md5-cache/dev-python/rebulk-2.0.1
 2011252124 metadata/md5-cache/dev-python/recommonmark-0.6.0
@@ -43063,14 +42931,12 @@
 2011252124 metadata/md5-cache/dev-python/redis-py-3.5.3
 2011252124 metadata/md5-cache/dev-python/rednose-0.4.3
 2011252124 metadata/md5-cache/dev-python/reflink-0.2.1-r1
-2011252124 metadata/md5-cache/dev-python/regex-2020.4.4-r1
 2011252124 metadata/md5-cache/dev-python/rencode-1.0.6
 2011252124 metadata/md5-cache/dev-python/reno-3.2.0-r1
 2011252124 metadata/md5-cache/dev-python/reportlab-3.5.48
 2011252124 metadata/md5-cache/dev-python/repoze-lru-0.7-r1
 2011252124 metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
 2011252124 metadata/md5-cache/dev-python/requests-2.24.0-r1
-2011252124 metadata/md5-cache/dev-python/requests-2.25.0
 2011252124 metadata/md5-cache/dev-python/requests-cache-0.5.2
 2011252124 metadata/md5-cache/dev-python/requests-credssp-1.1.1
 2011252124 metadata/md5-cache/dev-python/requests-file-1.4.3
@@ -43078,7 +42944,6 @@
 2011252124 metadata/md5-cache/dev-python/requests-mock-1.8.0
 2011252124 metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
 2011252124 metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
-2011252124 metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
 2011252124 metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
 2011252124 metadata/md5-cache/dev-python/requests_download-0.1.2
 2011252124 metadata/md5-cache/dev-python/requests_pkcs12-1.7
@@ -43090,7 +42955,6 @@
 2011252124 metadata/md5-cache/dev-python/retry-decorator-1.1.1
 2011252124 metadata/md5-cache/dev-python/retrying-1.3.3
 2011252124 metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
-2011252124 metadata/md5-cache/dev-python/rfc3986-1.4.0
 2011252124 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
 2011252124 metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
 2011252124 metadata/md5-cache/dev-python/rjsmin-1.1.0
@@ -43127,13 +42991,10 @@
 2011252124 metadata/md5-cache/dev-python/scipy-1.5.2
 2011252124 metadata/md5-cache/dev-python/scipy-1.5.3
 2011252124 metadata/md5-cache/dev-python/scipy-1.5.4
-2011252124 metadata/md5-cache/dev-python/scripttest-1.3.0-r1
-2011252124 metadata/md5-cache/dev-python/scrypt-0.8.16
 2011252124 metadata/md5-cache/dev-python/seaborn-0.10.1
 2011252124 metadata/md5-cache/dev-python/secretstorage-3.1.2
 2011252124 metadata/md5-cache/dev-python/secretstorage-3.2.0
 2011252124 metadata/md5-cache/dev-python/secretstorage-3.3.0
-2011252124 metadata/md5-cache/dev-python/selenium-3.141.0-r1
 2011252124 metadata/md5-cache/dev-python/semantic_version-2.8.5
 2011252124 metadata/md5-cache/dev-python/semver-2.13.0
 2011252124 metadata/md5-cache/dev-python/send2trash-1.5.0-r1
@@ -43142,12 +43003,10 @@
 2011252124 metadata/md5-cache/dev-python/serpent-1.30
 2011252124 metadata/md5-cache/dev-python/serpent-1.30.2
 2011252124 metadata/md5-cache/dev-python/serverfiles-0.2.1
-2011252124 metadata/md5-cache/dev-python/service_identity-18.1.0-r1
 2011252124 metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
 2011252124 metadata/md5-cache/dev-python/setproctitle-1.2
 2011252124 metadata/md5-cache/dev-python/setuptools-46.4.0-r3
 2011252124 metadata/md5-cache/dev-python/setuptools-50.3.0
-2011252124 metadata/md5-cache/dev-python/setuptools-git-1.2-r2
 2011252124 metadata/md5-cache/dev-python/setuptools_scm-4.1.2-r1
 2011252124 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
 2011252124 metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
@@ -43166,7 +43025,6 @@
 2011252124 metadata/md5-cache/dev-python/simplespectral-1.0.0
 2011252124 metadata/md5-cache/dev-python/simplespectral-9999
 2011252124 metadata/md5-cache/dev-python/simpy-3.0.13
-2011252124 metadata/md5-cache/dev-python/sip-4.19.22-r1
 2011252124 metadata/md5-cache/dev-python/sip-4.19.24
 2011252124 metadata/md5-cache/dev-python/six-1.15.0-r1
 2011252124 metadata/md5-cache/dev-python/slackclient-2.5.0
@@ -43176,19 +43034,14 @@
 2011252124 metadata/md5-cache/dev-python/slixmpp-9999
 2011252124 metadata/md5-cache/dev-python/smmap-3.0.4
 2011252124 metadata/md5-cache/dev-python/smmap2-2.0.3
-2011252124 metadata/md5-cache/dev-python/snakeoil-0.8.8
 2011252124 metadata/md5-cache/dev-python/snakeoil-9999
 2011252124 metadata/md5-cache/dev-python/snaketrace-0.1.1
 2011252124 metadata/md5-cache/dev-python/snappy-0.5.1-r1
 2011252124 metadata/md5-cache/dev-python/snapshottest-0.5.1
-2011252124 metadata/md5-cache/dev-python/snowballstemmer-2.0.0
 2011252124 metadata/md5-cache/dev-python/socketio-client-0.7.2
 2011252124 metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
-2011252124 metadata/md5-cache/dev-python/socketpool-0.5.3-r3
 2011252124 metadata/md5-cache/dev-python/sortedcollections-0.5.3
 2011252124 metadata/md5-cache/dev-python/sortedcontainers-2.2.2-r1
-2011252124 metadata/md5-cache/dev-python/sortedcontainers-2.3.0
-2011252124 metadata/md5-cache/dev-python/soupsieve-2.0.1
 2011252124 metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
 2011252124 metadata/md5-cache/dev-python/speaklater-1.3-r1
 2011252124 metadata/md5-cache/dev-python/speg-0.3-r1
@@ -43280,7 +43133,6 @@
 2011252124 metadata/md5-cache/dev-python/tempita-0.5.3-r3
 2011252124 metadata/md5-cache/dev-python/tempora-3.0.0
 2011252124 metadata/md5-cache/dev-python/tempora-4.0.0
-2011252124 metadata/md5-cache/dev-python/tempora-4.0.1
 2011252124 metadata/md5-cache/dev-python/tenacity-6.2.0
 2011252124 metadata/md5-cache/dev-python/termcolor-1.1.0-r2
 2011252124 metadata/md5-cache/dev-python/terminado-0.8.3
@@ -43289,7 +43141,6 @@
 2011252124 metadata/md5-cache/dev-python/terminaltables-9999
 2011252124 metadata/md5-cache/dev-python/test_server-0.0.31
 2011252124 metadata/md5-cache/dev-python/testfixtures-6.15.0
-2011252124 metadata/md5-cache/dev-python/testpath-0.4.4-r1
 2011252124 metadata/md5-cache/dev-python/testrepository-0.0.20
 2011252124 metadata/md5-cache/dev-python/testresources-2.0.1
 2011252124 metadata/md5-cache/dev-python/testscenarios-0.5.0-r1
@@ -43310,7 +43161,6 @@
 2011252124 metadata/md5-cache/dev-python/tld-0.12.2
 2011252124 metadata/md5-cache/dev-python/tldextract-2.2.1
 2011252124 metadata/md5-cache/dev-python/toml-0.10.1-r1
-2011252124 metadata/md5-cache/dev-python/toml-0.10.2
 2011252124 metadata/md5-cache/dev-python/toolz-0.11.1
 2011252124 metadata/md5-cache/dev-python/towncrier-19.2.0
 2011252124 metadata/md5-cache/dev-python/tox-3.20.1
@@ -43324,10 +43174,8 @@
 2011252124 metadata/md5-cache/dev-python/translate-toolkit-2.5.1
 2011252124 metadata/md5-cache/dev-python/translate-toolkit-3.2.0
 2011252124 metadata/md5-cache/dev-python/treq-20.9.0
-2011252124 metadata/md5-cache/dev-python/trustme-0.6.0-r1
 2011252124 metadata/md5-cache/dev-python/tubes-0.2.0-r1
 2011252124 metadata/md5-cache/dev-python/tvdb_api-2.0-r1
-2011252124 metadata/md5-cache/dev-python/twine-3.2.0
 2011252124 metadata/md5-cache/dev-python/twisted-19.10.0
 2011252124 metadata/md5-cache/dev-python/twisted-20.3.0
 2011252124 metadata/md5-cache/dev-python/twython-3.7.0
@@ -43335,9 +43183,7 @@
 2011252124 metadata/md5-cache/dev-python/txaio-20.4.1
 2011252124 metadata/md5-cache/dev-python/txgithub-15.0.0-r1
 2011252124 metadata/md5-cache/dev-python/txrequests-0.9.6
-2011252124 metadata/md5-cache/dev-python/typed-ast-1.4.1
 2011252124 metadata/md5-cache/dev-python/typing-3.7.4.3
-2011252124 metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
 2011252124 metadata/md5-cache/dev-python/tzlocal-2.1
 2011252124 metadata/md5-cache/dev-python/ubelt-0.9.1
 2011252124 metadata/md5-cache/dev-python/ujson-1.35-r1
@@ -43356,12 +43202,10 @@
 2011252124 metadata/md5-cache/dev-python/urllib3-1.24.2-r1
 2011252124 metadata/md5-cache/dev-python/urllib3-1.26.0
 2011252124 metadata/md5-cache/dev-python/urllib3-1.26.1
-2011252124 metadata/md5-cache/dev-python/urllib3-1.26.2
 2011252124 metadata/md5-cache/dev-python/urwid-2.1.1
 2011252124 metadata/md5-cache/dev-python/urwidtrees-1.0.3
 2011252124 metadata/md5-cache/dev-python/utidylib-0.6-r1
 2011252124 metadata/md5-cache/dev-python/uvloop-0.14.0
-2011252124 metadata/md5-cache/dev-python/vcrpy-4.1.1
 2011252124 metadata/md5-cache/dev-python/vcstools-0.1.42
 2011252124 metadata/md5-cache/dev-python/vcversioner-2.16.0.0
 2011252124 metadata/md5-cache/dev-python/vdf-3.3
@@ -43372,7 +43216,6 @@
 2011252124 metadata/md5-cache/dev-python/versioneer-0.19
 2011252124 metadata/md5-cache/dev-python/vine-1.3.0
 2011252124 metadata/md5-cache/dev-python/virtualenv-16.7.10-r1
-2011252124 metadata/md5-cache/dev-python/virtualenv-20.2.1
 2011252124 metadata/md5-cache/dev-python/virtualenv-clone-0.5.3
 2011252124 metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
 2011252124 metadata/md5-cache/dev-python/visitor-0.1.3-r1
@@ -43380,7 +43223,6 @@
 2011252124 metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
 2011252124 metadata/md5-cache/dev-python/voluptuous-0.12.0
 2011252124 metadata/md5-cache/dev-python/vpython-7.6.1-r2
-2011252124 metadata/md5-cache/dev-python/waitress-1.4.4
 2011252124 metadata/md5-cache/dev-python/wand-0.6.3
 2011252124 metadata/md5-cache/dev-python/warlock-1.3.3
 2011252124 metadata/md5-cache/dev-python/watchdog-0.10.3
@@ -43396,9 +43238,7 @@
 2011252124 metadata/md5-cache/dev-python/websockets-8.1
 2011252124 metadata/md5-cache/dev-python/websockify-0.9.0
 2011252124 metadata/md5-cache/dev-python/websockify-0.9.0-r1
-2011252124 metadata/md5-cache/dev-python/webtest-2.0.35
 2011252124 metadata/md5-cache/dev-python/werkzeug-1.0.1-r1
-2011252124 metadata/md5-cache/dev-python/wheel-0.35.1-r1
 2011252124 metadata/md5-cache/dev-python/whichcraft-0.6.1
 2011252124 metadata/md5-cache/dev-python/whisper-1.1.5
 2011252124 metadata/md5-cache/dev-python/whoosh-2.7.4-r1
@@ -43408,7 +43248,6 @@
 2011252124 metadata/md5-cache/dev-python/ws4py-0.5.1-r1
 2011252124 metadata/md5-cache/dev-python/ws4py-9999
 2011252124 metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
-2011252124 metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
 2011252124 metadata/md5-cache/dev-python/wsproto-0.15.0
 2011252124 metadata/md5-cache/dev-python/wsproto-1.0.0
 2011252124 metadata/md5-cache/dev-python/wstools-0.4.8
@@ -43430,7 +43269,6 @@
 2011252124 metadata/md5-cache/dev-python/xmlschema-1.2.4
 2011252124 metadata/md5-cache/dev-python/xmlschema-1.2.5
 2011252124 metadata/md5-cache/dev-python/xmlschema-1.3.0
-2011252124 metadata/md5-cache/dev-python/xmlschema-1.3.1
 2011252124 metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
 2011252124 metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
 2011252124 metadata/md5-cache/dev-python/xxhash-2.0.0
@@ -43440,7 +43278,6 @@
 2011252124 metadata/md5-cache/dev-python/yapsy-1.12.2
 2011252124 metadata/md5-cache/dev-python/yaql-1.1.3
 2011252124 metadata/md5-cache/dev-python/yarl-1.6.2
-2011252124 metadata/md5-cache/dev-python/yarl-1.6.3
 2011252124 metadata/md5-cache/dev-python/yaswfp-0.9.3-r1
 2011252124 metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1
 2011252124 metadata/md5-cache/dev-python/zc-lockfile-2.0
@@ -43463,8 +43300,6 @@
 2011252124 metadata/md5-cache/dev-python/zstandard-0.8.1-r1
 2011252124 metadata/md5-cache/dev-python/zstd-1.4.5.1
 2011252124 metadata/md5-cache/dev-python/zxcvbn-4.4.28
-2011261409 metadata/md5-cache/dev-python/PyQt5-5.15.1
-2011261409 metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1
 2011261139 metadata/md5-cache/dev-python/automaton-2.2.0
 2011261139 metadata/md5-cache/dev-python/awscli-1.18.160
 2011261139 metadata/md5-cache/dev-python/boto3-1.16.9
@@ -43476,18 +43311,14 @@
 2011261009 metadata/md5-cache/dev-python/feedparser-6.0.2
 2011261139 metadata/md5-cache/dev-python/futurist-2.3.0
 2011261139 metadata/md5-cache/dev-python/humanize-3.1.0
-2011261409 metadata/md5-cache/dev-python/iniconfig-1.0.0
 2011260909 metadata/md5-cache/dev-python/markdown-3.3.3
 2011261139 metadata/md5-cache/dev-python/microversion-parse-1.0.1
 2011261139 metadata/md5-cache/dev-python/mongomock-3.21.0
 2011261009 metadata/md5-cache/dev-python/pbr-5.5.1
-2011261009 metadata/md5-cache/dev-python/pip-20.2.4
-2011261409 metadata/md5-cache/dev-python/psutil-5.7.3
 2011261009 metadata/md5-cache/dev-python/pygments-2.7.2
 2011260139 metadata/md5-cache/dev-python/pytaglib-1.4.6
 2011261409 metadata/md5-cache/dev-python/pytest-6.1.1
 2011260909 metadata/md5-cache/dev-python/pytrie-0.4.0
-2011261009 metadata/md5-cache/dev-python/readme_renderer-28.0
 2011261209 metadata/md5-cache/dev-python/rq-1.5.2
 2011261209 metadata/md5-cache/dev-python/sentry-sdk-0.19.1
 2011261139 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.0
@@ -43495,38 +43326,26 @@
 2011260909 metadata/md5-cache/dev-python/u-msgpack-2.7.1
 2011261009 metadata/md5-cache/dev-python/urllib3-1.25.11
 2011261009 metadata/md5-cache/dev-python/virtualenv-20.1.0
-2011261009 metadata/md5-cache/dev-python/zipp-3.4.0
 2011270309 metadata/md5-cache/dev-python/aiohttp-3.6.2-r1
 2011270309 metadata/md5-cache/dev-python/aiohttp-3.7.2-r1
 2011270309 metadata/md5-cache/dev-python/aiohttp-3.7.3
 2011262239 metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
-2011262239 metadata/md5-cache/dev-python/async_generator-1.10
-2011262239 metadata/md5-cache/dev-python/async_timeout-3.0.1
-2011262239 metadata/md5-cache/dev-python/black-20.8_beta1
 2011262239 metadata/md5-cache/dev-python/blockdiag-2.0.1
 2011270309 metadata/md5-cache/dev-python/dask-2.30.0
 2011262239 metadata/md5-cache/dev-python/dataclasses-0.7
 2011262239 metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
 2011271239 metadata/md5-cache/dev-python/hypothesis-5.37.5
-2011271239 metadata/md5-cache/dev-python/hypothesis-5.41.3
 2011270309 metadata/md5-cache/dev-python/idna-ssl-1.1.0-r1
 2011271139 metadata/md5-cache/dev-python/lxml-4.6.1
-2011262239 metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
 2011270209 metadata/md5-cache/dev-python/pybind11-2.6.0
-2011261839 metadata/md5-cache/dev-python/pyfakefs-4.3.2
 2011271239 metadata/md5-cache/dev-python/pykka-2.0.3
-2011262239 metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
 2011271239 metadata/md5-cache/dev-python/pytest-xprocess-0.17.0
-2011270209 metadata/md5-cache/dev-python/python-mpd-1.1.0-r1
 2011262239 metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
 2011262239 metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
 2011262239 metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
 2011262239 metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
 2011262239 metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.4.0
-2011272309 metadata/md5-cache/dev-python/Manifest.gz
-2011271939 metadata/md5-cache/dev-python/aiohttp-3.7.1-r1
 2011271909 metadata/md5-cache/dev-python/kiwisolver-1.3.0
-2011272009 metadata/md5-cache/dev-python/lxml-4.6.2
 2011271909 metadata/md5-cache/dev-python/mysql-connector-python-8.0.22
 2011271909 metadata/md5-cache/dev-python/nest_asyncio-1.4.2
 2011271909 metadata/md5-cache/dev-python/os-resource-classes-1.0.0
@@ -43560,6 +43379,150 @@
 2011271909 metadata/md5-cache/dev-python/taskflow-4.5.0
 2011271909 metadata/md5-cache/dev-python/tooz-2.7.1
 2011271909 metadata/md5-cache/dev-python/vncdotool-1.0.0
+2011291209 metadata/md5-cache/dev-python/Manifest.gz
+2011281239 metadata/md5-cache/dev-python/PyQt5-5.15.1
+2011281239 metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1
+2011291139 metadata/md5-cache/dev-python/aiohttp-3.7.1-r1
+2011281709 metadata/md5-cache/dev-python/async_generator-1.10
+2011281909 metadata/md5-cache/dev-python/async_timeout-3.0.1
+2011281139 metadata/md5-cache/dev-python/attrs-20.3.0
+2011281509 metadata/md5-cache/dev-python/automat-20.2.0
+2011281909 metadata/md5-cache/dev-python/beautifulsoup-4.9.3
+2011281739 metadata/md5-cache/dev-python/betamax-0.8.1
+2011281709 metadata/md5-cache/dev-python/black-20.8_beta1
+2011281739 metadata/md5-cache/dev-python/bleach-3.2.1
+2011281539 metadata/md5-cache/dev-python/blessed-1.17.12
+2011281139 metadata/md5-cache/dev-python/blinker-1.4-r2
+2011281139 metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
+2011291139 metadata/md5-cache/dev-python/castellan-3.6.0
+2011281039 metadata/md5-cache/dev-python/cffi-1.14.0-r3
+2011281739 metadata/md5-cache/dev-python/characteristic-14.3.0-r3
+2011291209 metadata/md5-cache/dev-python/clang-python-11.0.0.9999
+2011291209 metadata/md5-cache/dev-python/clang-python-12.0.0.9999
+2011281139 metadata/md5-cache/dev-python/click-7.1.2-r1
+2011281509 metadata/md5-cache/dev-python/constantly-15.1.0-r1
+2011281709 metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1
+2011281709 metadata/md5-cache/dev-python/coverage-5.3
+2011281709 metadata/md5-cache/dev-python/cssselect-1.1.0-r1
+2011281839 metadata/md5-cache/dev-python/csv23-0.3.2-r1
+2011281709 metadata/md5-cache/dev-python/distlib-0.3.1-r1
+2011281139 metadata/md5-cache/dev-python/elementpath-2.0.4
+2011281739 metadata/md5-cache/dev-python/entrypoints-0.3-r2
+2011281209 metadata/md5-cache/dev-python/execnet-1.7.1-r1
+2011281839 metadata/md5-cache/dev-python/fields-5.0.0-r2
+2011281209 metadata/md5-cache/dev-python/filelock-3.0.12-r1
+2011281909 metadata/md5-cache/dev-python/flake8-3.8.3-r1
+2011281839 metadata/md5-cache/dev-python/flaky-3.7.0-r1
+2011281139 metadata/md5-cache/dev-python/flask-1.1.2-r1
+2011281709 metadata/md5-cache/dev-python/genty-1.3.2-r1
+2011281739 metadata/md5-cache/dev-python/gevent-20.9.0
+2011281509 metadata/md5-cache/dev-python/gmpy-2.0.8-r2
+2011281709 metadata/md5-cache/dev-python/greenlet-0.4.17
+2011281139 metadata/md5-cache/dev-python/httpbin-0.7.0-r1
+2011281509 metadata/md5-cache/dev-python/hyperlink-20.0.1
+2011281439 metadata/md5-cache/dev-python/hypothesis-5.41.3
+2011282309 metadata/md5-cache/dev-python/hypothesis-5.41.4
+2011281139 metadata/md5-cache/dev-python/importlib_metadata-3.1.0
+2011281139 metadata/md5-cache/dev-python/importlib_resources-3.3.0
+2011281509 metadata/md5-cache/dev-python/incremental-17.5.0
+2011281139 metadata/md5-cache/dev-python/inflect-5.0.2
+2011281109 metadata/md5-cache/dev-python/iniconfig-1.0.0
+2011281909 metadata/md5-cache/dev-python/isort-5.6.3
+2011281139 metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
+2011281739 metadata/md5-cache/dev-python/jaraco-classes-3.1.0
+2011281839 metadata/md5-cache/dev-python/jaraco-envs-2.0.0
+2011281839 metadata/md5-cache/dev-python/jaraco-functools-3.0.1
+2011281139 metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
+2011282009 metadata/md5-cache/dev-python/jeepney-0.6.0
+2011281839 metadata/md5-cache/dev-python/keyring-21.5.0
+2011291139 metadata/md5-cache/dev-python/keystonemiddleware-9.1.0
+2011291209 metadata/md5-cache/dev-python/lit-11.0.0.9999
+2011291209 metadata/md5-cache/dev-python/lit-12.0.0.9999
+2011291139 metadata/md5-cache/dev-python/lxml-4.6.2
+2011281509 metadata/md5-cache/dev-python/m2r-0.2.1
+2011281509 metadata/md5-cache/dev-python/mistune-0.8.4-r1
+2011281709 metadata/md5-cache/dev-python/monotonic-1.5-r1
+2011281109 metadata/md5-cache/dev-python/more-itertools-8.6.0
+2011281109 metadata/md5-cache/dev-python/multidict-5.0.0
+2011281739 metadata/md5-cache/dev-python/munch-2.5.0-r1
+2011281709 metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
+2011281139 metadata/md5-cache/dev-python/namespace-jaraco-2-r2
+2011281709 metadata/md5-cache/dev-python/namespace-paste-1-r1
+2011281439 metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
+2011291139 metadata/md5-cache/dev-python/os-brick-4.0.1
+2011281209 metadata/md5-cache/dev-python/packaging-20.5
+2011282309 metadata/md5-cache/dev-python/packaging-20.7
+2011281709 metadata/md5-cache/dev-python/passlib-1.7.4
+2011281739 metadata/md5-cache/dev-python/pastedeploy-2.1.1
+2011281739 metadata/md5-cache/dev-python/path-py-15.0.0
+2011281709 metadata/md5-cache/dev-python/pathlib2-2.3.5-r1
+2011281109 metadata/md5-cache/dev-python/pathspec-0.8.0
+2011281909 metadata/md5-cache/dev-python/pip-20.2.4
+2011281709 metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1
+2011281109 metadata/md5-cache/dev-python/pluggy-0.13.1-r1
+2011281839 metadata/md5-cache/dev-python/portend-2.7.0
+2011281709 metadata/md5-cache/dev-python/process-tests-2.1.1
+2011290339 metadata/md5-cache/dev-python/psutil-5.7.3
+2011281839 metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1
+2011281539 metadata/md5-cache/dev-python/pyaes-1.6.1-r2
+2011281439 metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
+2011281739 metadata/md5-cache/dev-python/pydocstyle-5.1.1
+2011281139 metadata/md5-cache/dev-python/pyfakefs-4.3.2
+2011281509 metadata/md5-cache/dev-python/pyhamcrest-2.0.2
+2011281909 metadata/md5-cache/dev-python/pylama-7.7.1-r1
+2011291139 metadata/md5-cache/dev-python/pylibacl-0.6.0
+2011281209 metadata/md5-cache/dev-python/pyopenssl-20.0.0
+2011281909 metadata/md5-cache/dev-python/pypiserver-1.4.2
+2011291139 metadata/md5-cache/dev-python/pypowervm-1.1.24
+2011281739 metadata/md5-cache/dev-python/pyproject2setuppy-9
+2011281909 metadata/md5-cache/dev-python/pyquery-1.4.3
+2011281509 metadata/md5-cache/dev-python/pyserial-3.5
+2011281139 metadata/md5-cache/dev-python/pytest-6.1.2
+2011281909 metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
+2011282009 metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
+2011281439 metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
+2011281139 metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
+2011281739 metadata/md5-cache/dev-python/pytest-localserver-0.5.0
+2011281139 metadata/md5-cache/dev-python/pytest-mock-3.3.1
+2011281209 metadata/md5-cache/dev-python/pytest-xdist-2.1.0
+2011290109 metadata/md5-cache/dev-python/python-docs-3.8.6
+2011281239 metadata/md5-cache/dev-python/python-mpd-1.1.0-r1
+2011290339 metadata/md5-cache/dev-python/re-assert-1.1.0
+2011281839 metadata/md5-cache/dev-python/readme_renderer-28.0
+2011281239 metadata/md5-cache/dev-python/reedsolomon-1.5.4
+2011281709 metadata/md5-cache/dev-python/regex-2020.4.4-r1
+2011281139 metadata/md5-cache/dev-python/requests-2.25.0
+2011281839 metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
+2011281739 metadata/md5-cache/dev-python/rfc3986-1.4.0
+2011281739 metadata/md5-cache/dev-python/scripttest-1.3.0-r1
+2011281709 metadata/md5-cache/dev-python/scrypt-0.8.16
+2011281839 metadata/md5-cache/dev-python/selenium-3.141.0-r1
+2011281439 metadata/md5-cache/dev-python/service_identity-18.1.0-r1
+2011281909 metadata/md5-cache/dev-python/setuptools-git-1.2-r2
+2011281109 metadata/md5-cache/dev-python/snakeoil-0.8.8
+2011281639 metadata/md5-cache/dev-python/snowballstemmer-2.0.0
+2011281839 metadata/md5-cache/dev-python/socketpool-0.5.3-r3
+2011281139 metadata/md5-cache/dev-python/sortedcontainers-2.3.0
+2011281909 metadata/md5-cache/dev-python/soupsieve-2.0.1
+2011281839 metadata/md5-cache/dev-python/tempora-4.0.1
+2011281839 metadata/md5-cache/dev-python/testpath-0.4.4-r1
+2011281139 metadata/md5-cache/dev-python/toml-0.10.2
+2011281739 metadata/md5-cache/dev-python/tqdm-4.54.0
+2011281439 metadata/md5-cache/dev-python/trustme-0.6.0-r1
+2011281909 metadata/md5-cache/dev-python/twine-3.2.0
+2011281639 metadata/md5-cache/dev-python/typed-ast-1.4.1
+2011281139 metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
+2011281439 metadata/md5-cache/dev-python/urllib3-1.26.2
+2011281139 metadata/md5-cache/dev-python/vcrpy-4.1.1
+2011281909 metadata/md5-cache/dev-python/virtualenv-20.2.1
+2011281739 metadata/md5-cache/dev-python/waitress-1.4.4
+2011281909 metadata/md5-cache/dev-python/webtest-2.0.35
+2011281739 metadata/md5-cache/dev-python/wheel-0.35.1-r1
+2011281909 metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
+2011291139 metadata/md5-cache/dev-python/xcffib-0.11.0
+2011281139 metadata/md5-cache/dev-python/xmlschema-1.3.1
+2011281139 metadata/md5-cache/dev-python/yarl-1.6.3
+2011281139 metadata/md5-cache/dev-python/zipp-3.4.0
 2010181809 metadata/md5-cache/dev-qt/qt-docs-5.15.1_p202009071124
 2011252124 metadata/md5-cache/dev-qt/qt-creator-4.12.3
 2011252124 metadata/md5-cache/dev-qt/qt-creator-9999
@@ -43618,7 +43581,6 @@
 2011260209 metadata/md5-cache/dev-qt/qtmultimedia-5.15.1
 2011260209 metadata/md5-cache/dev-qt/qtmultimedia-5.15.2
 2011260209 metadata/md5-cache/dev-qt/qtnetwork-5.15.1-r1
-2011260209 metadata/md5-cache/dev-qt/qtnetwork-5.15.2
 2011260209 metadata/md5-cache/dev-qt/qtnetworkauth-5.15.1
 2011260209 metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2
 2011260209 metadata/md5-cache/dev-qt/qtopengl-5.15.1
@@ -43676,8 +43638,9 @@
 2011260209 metadata/md5-cache/dev-qt/qtxml-5.15.2
 2011260209 metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.1
 2011260209 metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2
-2011280109 metadata/md5-cache/dev-qt/Manifest.gz
 2011280109 metadata/md5-cache/dev-qt/qtwebengine-5.15.2
+2011282339 metadata/md5-cache/dev-qt/Manifest.gz
+2011282339 metadata/md5-cache/dev-qt/qtnetwork-5.15.2
 2011252124 metadata/md5-cache/dev-ros/Manifest.gz
 2011252124 metadata/md5-cache/dev-ros/actionlib-1.13.2
 2011252124 metadata/md5-cache/dev-ros/actionlib-9999
@@ -45191,7 +45154,6 @@
 2011252124 metadata/md5-cache/dev-ruby/octokit-4.18.0-r1
 2011252124 metadata/md5-cache/dev-ruby/octokit-4.19.0
 2011252124 metadata/md5-cache/dev-ruby/omniauth-1.9.1
-2011252124 metadata/md5-cache/dev-ruby/open4-1.3.4
 2011252124 metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
 2011252124 metadata/md5-cache/dev-ruby/optimist-3.0.1
 2011252124 metadata/md5-cache/dev-ruby/optionable-0.2.0
@@ -45252,7 +45214,6 @@
 2011252124 metadata/md5-cache/dev-ruby/power_assert-1.2.0
 2011252124 metadata/md5-cache/dev-ruby/prawn-2.2.2
 2011252124 metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
-2011252124 metadata/md5-cache/dev-ruby/pry-0.13.1
 2011252124 metadata/md5-cache/dev-ruby/public_suffix-3.1.1
 2011252124 metadata/md5-cache/dev-ruby/public_suffix-4.0.5
 2011252124 metadata/md5-cache/dev-ruby/public_suffix-4.0.6
@@ -45799,14 +45760,15 @@
 2011260839 metadata/md5-cache/dev-ruby/loofah-2.8.0
 2011270909 metadata/md5-cache/dev-ruby/capybara-3.34.0
 2011270909 metadata/md5-cache/dev-ruby/sshkit-1.21.1
-2011281009 metadata/md5-cache/dev-ruby/Manifest.gz
 2011281009 metadata/md5-cache/dev-ruby/listen-3.3.2
 2011281009 metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
+2011290339 metadata/md5-cache/dev-ruby/Manifest.gz
+2011290339 metadata/md5-cache/dev-ruby/open4-1.3.4
+2011290339 metadata/md5-cache/dev-ruby/pry-0.13.1
 1807201639 metadata/md5-cache/dev-scheme/gauche-gl-0.6
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
 1708031509 metadata/md5-cache/dev-scheme/scmxlate-20090410-r1
-1708031509 metadata/md5-cache/dev-scheme/sigscheme-0.8.5-r1
 1708031239 metadata/md5-cache/dev-scheme/termite-0.15-r1
 1912150139 metadata/md5-cache/dev-scheme/elk-3.99.8
 2002112051 metadata/md5-cache/dev-scheme/scm-5.5.6-r4
@@ -45845,7 +45807,8 @@
 2011252124 metadata/md5-cache/dev-scheme/scm-5.5.6-r3
 2011252124 metadata/md5-cache/dev-scheme/tinyscheme-1.41
 2011252124 metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3
-2011261209 metadata/md5-cache/dev-scheme/Manifest.gz
+2011290239 metadata/md5-cache/dev-scheme/Manifest.gz
+2011290239 metadata/md5-cache/dev-scheme/sigscheme-0.8.5-r1
 1902111909 metadata/md5-cache/dev-tcltk/mysqltcl-3.052-r1
 1911121409 metadata/md5-cache/dev-tcltk/scwoop-4.1-r1
 1702282321 metadata/md5-cache/dev-tcltk/tkpng-0.9
@@ -45993,13 +45956,6 @@
 2010061839 metadata/md5-cache/dev-texlive/texlive-langjapanese-2020
 1805161038 metadata/md5-cache/dev-util/abi-compliance-checker-2.3
 1709052039 metadata/md5-cache/dev-util/abi-dumper-1.1
-1905132109 metadata/md5-cache/dev-util/android-ndk-10
-1905132109 metadata/md5-cache/dev-util/android-ndk-10b
-1905132109 metadata/md5-cache/dev-util/android-ndk-10d
-1905132109 metadata/md5-cache/dev-util/android-ndk-9
-1905132109 metadata/md5-cache/dev-util/android-ndk-9b
-1905132109 metadata/md5-cache/dev-util/android-ndk-9c
-1905132109 metadata/md5-cache/dev-util/android-ndk-9d
 1910181539 metadata/md5-cache/dev-util/autoproject-0.20_p5
 1702282321 metadata/md5-cache/dev-util/bats-0.4.0
 1904070139 metadata/md5-cache/dev-util/bcpp-20150811-r1
@@ -46058,7 +46014,6 @@
 2002182239 metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1
 2002230040 metadata/md5-cache/dev-util/patchbin-20160208
 2002230040 metadata/md5-cache/dev-util/tmake-2.12-r1
-2003211939 metadata/md5-cache/dev-util/android-ndk-10e
 2003211939 metadata/md5-cache/dev-util/android-ndk-11c
 2003211939 metadata/md5-cache/dev-util/android-ndk-11c-r1
 2003211939 metadata/md5-cache/dev-util/android-ndk-13b
@@ -46072,7 +46027,6 @@
 2003261841 metadata/md5-cache/dev-util/shflags-1.2.3
 2003311309 metadata/md5-cache/dev-util/bats-0.4.0_p20170219
 2004011639 metadata/md5-cache/dev-util/dialog-1.3.20200327
-2004032241 metadata/md5-cache/dev-util/kyua-0.13-r2
 2004032241 metadata/md5-cache/dev-util/patchutils-0.3.4
 2004032241 metadata/md5-cache/dev-util/shtool-2.0.8-r1
 2004032241 metadata/md5-cache/dev-util/treecc-0.3.10-r1
@@ -46187,10 +46141,8 @@
 2011252124 metadata/md5-cache/dev-util/aruba-0.6.2-r2
 2011252124 metadata/md5-cache/dev-util/aruba-1.0.2
 2011252124 metadata/md5-cache/dev-util/aruba-1.0.3
-2011252124 metadata/md5-cache/dev-util/aruba-1.0.3-r1
 2011252124 metadata/md5-cache/dev-util/astyle-3.0.1-r1
 2011252124 metadata/md5-cache/dev-util/astyle-3.1-r2
-2011252124 metadata/md5-cache/dev-util/babeltrace-1.2.3
 2011252124 metadata/md5-cache/dev-util/babeltrace-1.2.4
 2011252124 metadata/md5-cache/dev-util/bazel-0.22.0
 2011252124 metadata/md5-cache/dev-util/bazel-0.24.1
@@ -46273,7 +46225,6 @@
 2011252124 metadata/md5-cache/dev-util/cmake-3.18.4
 2011252124 metadata/md5-cache/dev-util/cmake-3.18.5
 2011252124 metadata/md5-cache/dev-util/cmake-3.19.0
-2011252124 metadata/md5-cache/dev-util/cmake-3.19.1
 2011252124 metadata/md5-cache/dev-util/cmake-fedora-2.7.1
 2011252124 metadata/md5-cache/dev-util/cmocka-1.1.5
 2011252124 metadata/md5-cache/dev-util/codeblocks-17.12-r303
@@ -46321,7 +46272,6 @@
 2011252124 metadata/md5-cache/dev-util/cucumber-tag-expressions-2.0.4
 2011252124 metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
 2011252124 metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
-2011252124 metadata/md5-cache/dev-util/cunit-2.1_p3
 2011252124 metadata/md5-cache/dev-util/cutils-1.6-r4
 2011252124 metadata/md5-cache/dev-util/cutter-1.12.0
 2011252124 metadata/md5-cache/dev-util/cvise-1.6.0
@@ -46336,11 +46286,9 @@
 2011252124 metadata/md5-cache/dev-util/debhelper-13.2.1
 2011252124 metadata/md5-cache/dev-util/debhelper-9.20160814
 2011252124 metadata/md5-cache/dev-util/debugedit-4.16.0
-2011252124 metadata/md5-cache/dev-util/desktop-file-utils-0.26
 2011252124 metadata/md5-cache/dev-util/devhelp-3.36.2
 2011252124 metadata/md5-cache/dev-util/dialog-1.3.20170131
 2011252124 metadata/md5-cache/dev-util/diffball-1.0.1-r2
-2011252124 metadata/md5-cache/dev-util/diffoscope-161
 2011252124 metadata/md5-cache/dev-util/diffuse-0.5.0_alpha7-r1
 2011252124 metadata/md5-cache/dev-util/dirdiff-2.1-r3
 2011252124 metadata/md5-cache/dev-util/dissembler-0.9-r1
@@ -46348,7 +46296,6 @@
 2011252124 metadata/md5-cache/dev-util/docker-ls-0.3.1
 2011252124 metadata/md5-cache/dev-util/dogtail-0.9.11
 2011252124 metadata/md5-cache/dev-util/dput-ng-1.28-r1
-2011252124 metadata/md5-cache/dev-util/dropwatch-1.4-r1
 2011252124 metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
 2011252124 metadata/md5-cache/dev-util/duma-2.5.15-r2
 2011252124 metadata/md5-cache/dev-util/dwarves-1.17
@@ -46459,11 +46406,8 @@
 2011252124 metadata/md5-cache/dev-util/kup-0.3.4-r1
 2011252124 metadata/md5-cache/dev-util/leaktracer-2.4-r3
 2011252124 metadata/md5-cache/dev-util/libabigail-1.6
-2011252124 metadata/md5-cache/dev-util/lldb-10.0.0
 2011252124 metadata/md5-cache/dev-util/lldb-10.0.1
 2011252124 metadata/md5-cache/dev-util/lldb-11.0.0
-2011252124 metadata/md5-cache/dev-util/lldb-11.0.0.9999
-2011252124 metadata/md5-cache/dev-util/lldb-12.0.0.9999
 2011252124 metadata/md5-cache/dev-util/lldb-9.0.1-r1
 2011252124 metadata/md5-cache/dev-util/lockrun-20120508-r1
 2011252124 metadata/md5-cache/dev-util/ltrace-0.7.3_p4-r1
@@ -46535,13 +46479,11 @@
 2011252124 metadata/md5-cache/dev-util/patchelf-0.11
 2011252124 metadata/md5-cache/dev-util/patchelf-0.12
 2011252124 metadata/md5-cache/dev-util/patchutils-0.3.3
-2011252124 metadata/md5-cache/dev-util/peg-0.1.15-r1
 2011252124 metadata/md5-cache/dev-util/peg-0.1.18
 2011252124 metadata/md5-cache/dev-util/perf-5.4.20
 2011252124 metadata/md5-cache/dev-util/perf-5.7-r1
 2011252124 metadata/md5-cache/dev-util/perf-5.8
 2011252124 metadata/md5-cache/dev-util/perf-5.9.9
-2011252124 metadata/md5-cache/dev-util/pkgcheck-0.7.7
 2011252124 metadata/md5-cache/dev-util/pkgcheck-9999
 2011252124 metadata/md5-cache/dev-util/pkgconf-1.6.3
 2011252124 metadata/md5-cache/dev-util/pkgconf-1.7.2
@@ -46590,7 +46532,6 @@
 2011252124 metadata/md5-cache/dev-util/rats-2.4
 2011252124 metadata/md5-cache/dev-util/rbtools-1.0.2
 2011252124 metadata/md5-cache/dev-util/rbtools-1.0.3
-2011252124 metadata/md5-cache/dev-util/rebar-2.6.4
 2011252124 metadata/md5-cache/dev-util/rebar-2.6.4-r1
 2011252124 metadata/md5-cache/dev-util/redo-0.42a
 2011252124 metadata/md5-cache/dev-util/redo-0.42c
@@ -46704,7 +46645,6 @@
 2011252124 metadata/md5-cache/dev-util/ydiff-1.2
 2011252124 metadata/md5-cache/dev-util/yuicompressor-2.4.8-r2
 2011260209 metadata/md5-cache/dev-util/idea-community-2020.2.4.202.8194.7
-2011281009 metadata/md5-cache/dev-util/Manifest.gz
 2011281009 metadata/md5-cache/dev-util/bingrep-0.8.2
 2011272209 metadata/md5-cache/dev-util/bpftrace-0.11.4
 2011281009 metadata/md5-cache/dev-util/cargo-audit-0.13.1
@@ -46723,6 +46663,16 @@
 2011281009 metadata/md5-cache/dev-util/sccache-0.2.13
 2011281009 metadata/md5-cache/dev-util/sccache-9999
 2011281009 metadata/md5-cache/dev-util/wasmer-0.11.0
+2011291209 metadata/md5-cache/dev-util/Manifest.gz
+2011290339 metadata/md5-cache/dev-util/aruba-1.0.3-r1
+2011281839 metadata/md5-cache/dev-util/cmake-3.19.1
+2011281539 metadata/md5-cache/dev-util/cunit-2.1_p3
+2011282039 metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
+2011281339 metadata/md5-cache/dev-util/kyua-0.13-r2
+2011291209 metadata/md5-cache/dev-util/lldb-11.0.0.9999
+2011291209 metadata/md5-cache/dev-util/lldb-12.0.0.9999
+2011281109 metadata/md5-cache/dev-util/pkgcheck-0.7.7
+2011281109 metadata/md5-cache/dev-util/rustup-1.23.0
 1910111911 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809152309 metadata/md5-cache/dev-vcs/cvsutils-0.2.5-r1
@@ -47136,7 +47086,6 @@
 2003311822 metadata/md5-cache/games-emulation/fbzx-3.0.0-r1
 2003311822 metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1
 2009021410 metadata/md5-cache/games-emulation/libretro-info-9999
-2011252124 metadata/md5-cache/games-emulation/Manifest.gz
 2011252124 metadata/md5-cache/games-emulation/advancemame-3.9
 2011252124 metadata/md5-cache/games-emulation/advancescan-1.16-r1
 2011252124 metadata/md5-cache/games-emulation/atari800-4.2.0
@@ -47198,8 +47147,6 @@
 2011252124 metadata/md5-cache/games-emulation/pcsx2-9999
 2011252124 metadata/md5-cache/games-emulation/pcsxr-1.9.94_p20190306
 2011252124 metadata/md5-cache/games-emulation/pcsxr-9999
-2011252124 metadata/md5-cache/games-emulation/ppsspp-1.5.4-r2
-2011252124 metadata/md5-cache/games-emulation/ppsspp-9999
 2011252124 metadata/md5-cache/games-emulation/snes9x-1.59.2
 2011252124 metadata/md5-cache/games-emulation/snes9x-1.60
 2011252124 metadata/md5-cache/games-emulation/stella-5.1.3
@@ -47208,6 +47155,8 @@
 2011252124 metadata/md5-cache/games-emulation/yabause-0.9.15
 2011252124 metadata/md5-cache/games-emulation/zsnes-1.51-r8
 2011252124 metadata/md5-cache/games-emulation/zsnes-1.51-r9
+2011281209 metadata/md5-cache/games-emulation/Manifest.gz
+2011281209 metadata/md5-cache/games-emulation/ppsspp-1.10.3
 1707090139 metadata/md5-cache/games-engines/xzip-1.8.2-r3
 2004101409 metadata/md5-cache/games-engines/zoom-1.1.5-r1
 2010132009 metadata/md5-cache/games-engines/love-0.7.2-r2
@@ -47215,11 +47164,9 @@
 2010132009 metadata/md5-cache/games-engines/love-11.3
 2010132009 metadata/md5-cache/games-engines/love-9999
 2011050809 metadata/md5-cache/games-engines/exult-1.6
-2011252124 metadata/md5-cache/games-engines/Manifest.gz
 2011252124 metadata/md5-cache/games-engines/box2d-2.1.2
 2011252124 metadata/md5-cache/games-engines/box2d-2.2.1
 2011252124 metadata/md5-cache/games-engines/box2d-2.3.1
-2011252124 metadata/md5-cache/games-engines/dMagnetic-0.27
 2011252124 metadata/md5-cache/games-engines/devilutionx-1.0.1
 2011252124 metadata/md5-cache/games-engines/devilutionx-1.0.3
 2011252124 metadata/md5-cache/games-engines/devilutionx-1.1.0
@@ -47250,6 +47197,8 @@
 2011252124 metadata/md5-cache/games-engines/solarus-1.3.1-r1
 2011252124 metadata/md5-cache/games-engines/stratagus-2.4.1
 2011252124 metadata/md5-cache/games-engines/stratagus-2.4.3
+2011281509 metadata/md5-cache/games-engines/Manifest.gz
+2011281509 metadata/md5-cache/games-engines/dMagnetic-0.28
 1911080039 metadata/md5-cache/games-fps/freedoom-0.12.1
 1910280309 metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r4
 1910280309 metadata/md5-cache/games-fps/ut2004-bonuspack-mega-1-r3
@@ -48707,9 +48656,10 @@
 2011252124 metadata/md5-cache/mail-client/trojita-0.7-r5
 2011252124 metadata/md5-cache/mail-client/trojita-9999
 2011270209 metadata/md5-cache/mail-client/mutt-2.0.2
-2011271839 metadata/md5-cache/mail-client/Manifest.gz
 2011271839 metadata/md5-cache/mail-client/neomutt-20201120
 2011271839 metadata/md5-cache/mail-client/neomutt-20201127
+2011282309 metadata/md5-cache/mail-client/Manifest.gz
+2011282309 metadata/md5-cache/mail-client/roundcube-1.4.9
 1910111911 metadata/md5-cache/mail-filter/mailfilter-0.8.4
 1906181439 metadata/md5-cache/mail-filter/postforward-1.1.1
 1902152139 metadata/md5-cache/mail-filter/sieve-connect-0.87-r1
@@ -48817,8 +48767,8 @@
 2011252124 metadata/md5-cache/mail-mta/sendmail-8.16.1
 2011252124 metadata/md5-cache/mail-mta/ssmtp-2.64-r3
 2011260139 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.5.2
-2011272009 metadata/md5-cache/mail-mta/Manifest.gz
-2011272009 metadata/md5-cache/mail-mta/msmtp-1.8.12
+2011291139 metadata/md5-cache/mail-mta/Manifest.gz
+2011291139 metadata/md5-cache/mail-mta/msmtp-1.8.12
 2008070639 metadata/md5-cache/mate-base/mate-1.24
 2008070639 metadata/md5-cache/mate-base/mate-applets-meta-1.24.0
 2011061540 metadata/md5-cache/mate-base/mate-common-1.24.1
@@ -49786,7 +49736,6 @@
 2011252124 metadata/md5-cache/media-libs/libirman-0.4.5
 2011252124 metadata/md5-cache/media-libs/libjpeg-turbo-1.5.3-r4
 2011252124 metadata/md5-cache/media-libs/libjpeg-turbo-2.0.5-r2
-2011252124 metadata/md5-cache/media-libs/libjpeg-turbo-2.0.6
 2011252124 metadata/md5-cache/media-libs/libjsw-1.5.8
 2011252124 metadata/md5-cache/media-libs/libkate-0.4.1-r4
 2011252124 metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20150206
@@ -50017,9 +49966,6 @@
 2011252124 metadata/md5-cache/media-libs/sdl2-ttf-2.0.15
 2011252124 metadata/md5-cache/media-libs/sg-1.5
 2011252124 metadata/md5-cache/media-libs/sge-030809
-2011252124 metadata/md5-cache/media-libs/shaderc-2018.0
-2011252124 metadata/md5-cache/media-libs/shaderc-2019.0-r1
-2011252124 metadata/md5-cache/media-libs/shaderc-2020.1
 2011252124 metadata/md5-cache/media-libs/shaderc-2020.2
 2011252124 metadata/md5-cache/media-libs/shaderc-2020.4_pre20201106
 2011252124 metadata/md5-cache/media-libs/simage-1.8.0
@@ -50098,8 +50044,9 @@
 2011252124 metadata/md5-cache/media-libs/zxing-cpp-1.1.1
 2011261139 metadata/md5-cache/media-libs/dav1d-0.7.1
 2011261339 metadata/md5-cache/media-libs/icclib-2.14
-2011270209 metadata/md5-cache/media-libs/Manifest.gz
 2011270209 metadata/md5-cache/media-libs/libprojectm-3.1.8
+2011290109 metadata/md5-cache/media-libs/Manifest.gz
+2011281909 metadata/md5-cache/media-libs/libjpeg-turbo-2.0.6
 1908120039 metadata/md5-cache/media-plugins/hexter-1.1.0
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
 1912241539 metadata/md5-cache/media-plugins/vdr-burn-templates-0.0.3
@@ -50874,7 +50821,6 @@
 2011252124 metadata/md5-cache/media-sound/herrie-2.2-r1
 2011252124 metadata/md5-cache/media-sound/horgand-1.14-r2
 2011252124 metadata/md5-cache/media-sound/hydrogen-1.0.1
-2011252124 metadata/md5-cache/media-sound/hydrogen-9999
 2011252124 metadata/md5-cache/media-sound/id3-0.15-r1
 2011252124 metadata/md5-cache/media-sound/id3ed-1.10.4-r1
 2011252124 metadata/md5-cache/media-sound/id3ted-1.0
@@ -51128,15 +51074,15 @@
 2011252124 metadata/md5-cache/media-sound/yoshimi-1.7.2
 2011252124 metadata/md5-cache/media-sound/zynaddsubfx-3.0.5
 2011260309 metadata/md5-cache/media-sound/upmpdcli-1.5.2
-2011270039 metadata/md5-cache/media-sound/Manifest.gz
 2011262009 metadata/md5-cache/media-sound/gmtp-1.3.11-r1
 2011270039 metadata/md5-cache/media-sound/teamspeak-client-3.5.3-r1
 2011270039 metadata/md5-cache/media-sound/teamspeak-client-3.5.6-r1
+2011281309 metadata/md5-cache/media-sound/Manifest.gz
+2011281309 metadata/md5-cache/media-sound/hydrogen-9999
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 1702282327 metadata/md5-cache/media-tv/mythtv-status-0.10.4
 1702282327 metadata/md5-cache/media-tv/shoutcast2vdr-0.0.8-r1
 1702282327 metadata/md5-cache/media-tv/w_scan-20141122
-1901261409 metadata/md5-cache/media-tv/w_scan-20170107
 1910170740 metadata/md5-cache/media-tv/xmltv-0.5.70
 2007051209 metadata/md5-cache/media-tv/xmltv-0.6.1
 2007291039 metadata/md5-cache/media-tv/tvbrowser-bin-4.2.1
@@ -51144,7 +51090,6 @@
 2009051609 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
 2009051609 metadata/md5-cache/media-tv/dtv-scan-tables-9999
 2011061444 metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.8
-2011252124 metadata/md5-cache/media-tv/Manifest.gz
 2011252124 metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r2
 2011252124 metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1
 2011252124 metadata/md5-cache/media-tv/dvbtune-0.5-r1
@@ -51167,6 +51112,8 @@
 2011252124 metadata/md5-cache/media-tv/v4l-utils-1.10.1
 2011252124 metadata/md5-cache/media-tv/v4l-utils-1.16.6
 2011252124 metadata/md5-cache/media-tv/v4l-utils-1.20.0
+2011290239 metadata/md5-cache/media-tv/Manifest.gz
+2011290239 metadata/md5-cache/media-tv/w_scan-20170107
 1702282327 metadata/md5-cache/media-video/binkplayer-1.99w
 1810060109 metadata/md5-cache/media-video/blinkensim-2.7-r1
 1904012039 metadata/md5-cache/media-video/blinkenthemes-0.10-r1
@@ -51243,7 +51190,6 @@
 2011252124 metadata/md5-cache/media-video/ffcast-2.4.8
 2011252124 metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r2
 2011252124 metadata/md5-cache/media-video/ffmpeg-4.2.4
-2011252124 metadata/md5-cache/media-video/ffmpeg-4.3.1
 2011252124 metadata/md5-cache/media-video/ffmpeg-9999
 2011252124 metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
 2011252124 metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0-r1
@@ -51405,11 +51351,13 @@
 2011252124 metadata/md5-cache/media-video/xine-ui-0.99.12
 2011252124 metadata/md5-cache/media-video/xvattr-1.3-r3
 2011252124 metadata/md5-cache/media-video/yle-dl-20201022
-2011281009 metadata/md5-cache/media-video/Manifest.gz
-2011271939 metadata/md5-cache/media-video/mplayer-1.4-r1
 2011281009 metadata/md5-cache/media-video/rav1e-0.3.3
 2011281009 metadata/md5-cache/media-video/rav1e-0.3.4
 2011281009 metadata/md5-cache/media-video/rav1e-9999
+2011281709 metadata/md5-cache/media-video/Manifest.gz
+2011281439 metadata/md5-cache/media-video/ffmpeg-4.3.1
+2011281239 metadata/md5-cache/media-video/mplayer-1.4-r1
+2011281709 metadata/md5-cache/media-video/pipewire-0.3.17
 1910070809 metadata/md5-cache/net-analyzer/arptools-1.0.2
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 1702282328 metadata/md5-cache/net-analyzer/calamaris-2.99.4.0
@@ -52027,10 +51975,10 @@
 2011252124 metadata/md5-cache/net-dns/unbound-1.12.0
 2011252124 metadata/md5-cache/net-dns/unbound-1.12.0-r1
 2011260039 metadata/md5-cache/net-dns/pdns-recursor-4.4.1
-2011270209 metadata/md5-cache/net-dns/c-ares-1.17.1
-2011272009 metadata/md5-cache/net-dns/Manifest.gz
-2011272009 metadata/md5-cache/net-dns/idnkit-2.3
-2011272009 metadata/md5-cache/net-dns/ldns-utils-1.7.1
+2011291139 metadata/md5-cache/net-dns/Manifest.gz
+2011281539 metadata/md5-cache/net-dns/c-ares-1.17.1
+2011291139 metadata/md5-cache/net-dns/idnkit-2.3
+2011291139 metadata/md5-cache/net-dns/ldns-utils-1.7.1
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2011252124 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
@@ -52076,7 +52024,6 @@
 2011252124 metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006
 2011252124 metadata/md5-cache/net-firewall/psad-2.2.5
 2011252124 metadata/md5-cache/net-firewall/psad-2.4.5
-2011252124 metadata/md5-cache/net-firewall/psad-2.4.6
 2011252124 metadata/md5-cache/net-firewall/rtsp-conntrack-3.7-r2
 2011252124 metadata/md5-cache/net-firewall/rtsp-conntrack-4.18-r1
 2011252124 metadata/md5-cache/net-firewall/sanewall-1.1.6-r3
@@ -52086,8 +52033,9 @@
 2011252124 metadata/md5-cache/net-firewall/xtables-addons-3.7-r1
 2011252124 metadata/md5-cache/net-firewall/xtables-addons-3.8-r1
 2011252124 metadata/md5-cache/net-firewall/xtables-addons-3.9
-2011272009 metadata/md5-cache/net-firewall/Manifest.gz
-2011272009 metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1
+2011291139 metadata/md5-cache/net-firewall/Manifest.gz
+2011291139 metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1
+2011291139 metadata/md5-cache/net-firewall/psad-2.4.6
 1909212039 metadata/md5-cache/net-fs/mc-2019.07.17.22.13.42
 1909212039 metadata/md5-cache/net-fs/mc-2019.07.31.19.17.35
 1702282328 metadata/md5-cache/net-fs/openafs-legacy-0.1
@@ -52166,8 +52114,8 @@
 2011252124 metadata/md5-cache/net-ftp/tlswrap-1.04-r3
 2011252124 metadata/md5-cache/net-ftp/vsftpd-3.0.3-r3
 2011252124 metadata/md5-cache/net-ftp/yafc-1.3.7
-2011272009 metadata/md5-cache/net-ftp/Manifest.gz
-2011272009 metadata/md5-cache/net-ftp/gproftpd-8.3.2-r2
+2011291139 metadata/md5-cache/net-ftp/Manifest.gz
+2011291139 metadata/md5-cache/net-ftp/gproftpd-8.3.2-r2
 1910111911 metadata/md5-cache/net-im/centerim-5.0.1
 1702282328 metadata/md5-cache/net-im/gg-transport-2.2.6
 1905062239 metadata/md5-cache/net-im/profanity-0.6.0
@@ -52217,7 +52165,6 @@
 2011252124 metadata/md5-cache/net-im/gajim-1.2.2
 2011252124 metadata/md5-cache/net-im/gitter-bin-3.1.0
 2011252124 metadata/md5-cache/net-im/gitter-bin-4.1.0
-2011252124 metadata/md5-cache/net-im/kadu-4.3-r2
 2011252124 metadata/md5-cache/net-im/kouchat-1.1.0
 2011252124 metadata/md5-cache/net-im/libcommuni-3.5.0_p20200711
 2011252124 metadata/md5-cache/net-im/mcabber-1.1.0-r1
@@ -52260,8 +52207,8 @@
 2011252124 metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
 2011252124 metadata/md5-cache/net-im/ysm-2.9.9.1-r1
 2011261439 metadata/md5-cache/net-im/prosody-0.11.7-r2
-2011270109 metadata/md5-cache/net-im/Manifest.gz
-2011270109 metadata/md5-cache/net-im/zoom-5.4.54779.1115-r2
+2011281909 metadata/md5-cache/net-im/Manifest.gz
+2011281639 metadata/md5-cache/net-im/zoom-5.4.54779.1115-r3
 1812301839 metadata/md5-cache/net-irc/eggdrop-1.8.4
 1802070108 metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r1
 2002112051 metadata/md5-cache/net-irc/bnc-2.9.4-r1
@@ -52327,8 +52274,8 @@
 2011252124 metadata/md5-cache/net-irc/znc-1.8.2
 2011252124 metadata/md5-cache/net-irc/znc-9999
 2011252124 metadata/md5-cache/net-irc/znc-palaver-1.2.1
-2011271909 metadata/md5-cache/net-irc/Manifest.gz
-2011271909 metadata/md5-cache/net-irc/emech-3.0.99_p3
+2011291139 metadata/md5-cache/net-irc/Manifest.gz
+2011291139 metadata/md5-cache/net-irc/emech-3.0.99_p3
 1903300009 metadata/md5-cache/net-libs/freaklabs-chibiarduino-1.0.8_p20190329
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.3.2
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.4.3
@@ -52617,7 +52564,6 @@
 2011252124 metadata/md5-cache/net-libs/libvncserver-0.9.13
 2011252124 metadata/md5-cache/net-libs/libwebsockets-3.2.1
 2011252124 metadata/md5-cache/net-libs/libwebsockets-4.0.20
-2011252124 metadata/md5-cache/net-libs/libwebsockets-4.1.4
 2011252124 metadata/md5-cache/net-libs/libzapojit-0.0.3
 2011252124 metadata/md5-cache/net-libs/liquid-dsp-1.3.0
 2011252124 metadata/md5-cache/net-libs/liquid-dsp-1.3.1
@@ -52644,7 +52590,6 @@
 2011252124 metadata/md5-cache/net-libs/net6-1.3.14-r2
 2011252124 metadata/md5-cache/net-libs/netwib-5.39.0
 2011252124 metadata/md5-cache/net-libs/nghttp2-1.41.0
-2011252124 metadata/md5-cache/net-libs/nghttp2-1.42.0
 2011252124 metadata/md5-cache/net-libs/nghttp2-9999
 2011252124 metadata/md5-cache/net-libs/nghttp3-0_pre20190912
 2011252124 metadata/md5-cache/net-libs/nghttp3-9999
@@ -52725,16 +52670,18 @@
 2011252124 metadata/md5-cache/net-libs/zmqpp-4.2.0
 2011260009 metadata/md5-cache/net-libs/srt-1.4.2
 2011270009 metadata/md5-cache/net-libs/libslirp-4.3.1-r1
-2011281009 metadata/md5-cache/net-libs/Manifest.gz
-2011272009 metadata/md5-cache/net-libs/cppzmq-4.6.0
 2011271409 metadata/md5-cache/net-libs/gnutls-3.6.15
-2011272009 metadata/md5-cache/net-libs/libnids-1.24-r7
-2011272009 metadata/md5-cache/net-libs/libpcapnav-0.8-r1
-2011272009 metadata/md5-cache/net-libs/libsmi-0.5.0-r1
 2011281009 metadata/md5-cache/net-libs/quiche-0.5.1
 2011281009 metadata/md5-cache/net-libs/quiche-0.6.0
 2011281009 metadata/md5-cache/net-libs/quiche-9999
 2011280009 metadata/md5-cache/net-libs/webkit-gtk-2.30.3
+2011291139 metadata/md5-cache/net-libs/Manifest.gz
+2011291139 metadata/md5-cache/net-libs/cppzmq-4.6.0
+2011291139 metadata/md5-cache/net-libs/libnids-1.24-r7
+2011291139 metadata/md5-cache/net-libs/libpcapnav-0.8-r1
+2011291139 metadata/md5-cache/net-libs/libsmi-0.5.0-r1
+2011291139 metadata/md5-cache/net-libs/libwebsockets-4.1.4
+2011281539 metadata/md5-cache/net-libs/nghttp2-1.42.0
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1702282329 metadata/md5-cache/net-mail/imapsync-1.592-r1
 1804271339 metadata/md5-cache/net-mail/imapsync-1.836
@@ -52862,7 +52809,6 @@
 2011252124 metadata/md5-cache/net-mail/sendEmail-1.56-r2
 2011252124 metadata/md5-cache/net-mail/serialmail-0.75-r5
 2011252124 metadata/md5-cache/net-mail/smtptools-0.2.3-r1
-2011252124 metadata/md5-cache/net-mail/swaks-20130209.0-r1
 2011252124 metadata/md5-cache/net-mail/tnef-1.4.18
 2011252124 metadata/md5-cache/net-mail/tpop3d-1.5.5-r1
 2011252124 metadata/md5-cache/net-mail/vacation-1.2.7.0
@@ -52872,9 +52818,9 @@
 2011252124 metadata/md5-cache/net-mail/vqadmin-2.3.7
 2011252124 metadata/md5-cache/net-mail/ytnef-1.9.3
 2011261739 metadata/md5-cache/net-mail/b4-0.5.3
-2011281009 metadata/md5-cache/net-mail/Manifest.gz
-2011272009 metadata/md5-cache/net-mail/fdm-2.0
 2011281009 metadata/md5-cache/net-mail/swaks-20201014.0
+2011291139 metadata/md5-cache/net-mail/Manifest.gz
+2011291139 metadata/md5-cache/net-mail/fdm-2.0
 1910170740 metadata/md5-cache/net-misc/arpsponge-3.17.11
 1910022239 metadata/md5-cache/net-misc/autossh-1.4g
 1911110039 metadata/md5-cache/net-misc/autoupnp-0.4.7
@@ -52933,7 +52879,6 @@
 2003261841 metadata/md5-cache/net-misc/netdate-1.2-r1
 2003311209 metadata/md5-cache/net-misc/asterisk-opus-13.0.1.3.0
 2004032241 metadata/md5-cache/net-misc/ipcalc-0.41
-2004032241 metadata/md5-cache/net-misc/keychain-2.8.5
 2004032241 metadata/md5-cache/net-misc/unix2tcp-0.8.2-r1
 2004131109 metadata/md5-cache/net-misc/asterisk-g729-16.0.3.1.9
 2004131109 metadata/md5-cache/net-misc/asterisk-opus-16.0.1.3.0
@@ -52958,7 +52903,6 @@
 2009130739 metadata/md5-cache/net-misc/mulk-0.7.0-r1
 2009130739 metadata/md5-cache/net-misc/selfdhcp-0.2a-r2
 2009141809 metadata/md5-cache/net-misc/geoipupdate-4.3.0
-2010102239 metadata/md5-cache/net-misc/ipmiview-2.17.0.200505
 2010112109 metadata/md5-cache/net-misc/s6-networking-2.3.2.0
 2010160639 metadata/md5-cache/net-misc/sshpass-1.06
 2010201409 metadata/md5-cache/net-misc/unison-2.48.15_p4-r2
@@ -53052,7 +52996,6 @@
 2011252124 metadata/md5-cache/net-misc/dhcp-4.4.2
 2011252124 metadata/md5-cache/net-misc/dhcp-4.4.2-r3
 2011252124 metadata/md5-cache/net-misc/dhcpcd-8.1.9
-2011252124 metadata/md5-cache/net-misc/dhcpcd-9.3.2
 2011252124 metadata/md5-cache/net-misc/dhcpcd-9.3.3
 2011252124 metadata/md5-cache/net-misc/dhcpcd-9999
 2011252124 metadata/md5-cache/net-misc/dhcpcd-ui-0.7.7-r1
@@ -53366,11 +53309,6 @@
 2011252124 metadata/md5-cache/net-misc/taptap-1.0
 2011252124 metadata/md5-cache/net-misc/taylor-uucp-1.07-r4
 2011252124 metadata/md5-cache/net-misc/tcpsound-0.3.1-r1
-2011252124 metadata/md5-cache/net-misc/teamviewer-15.0.8397
-2011252124 metadata/md5-cache/net-misc/teamviewer-15.1.3937
-2011252124 metadata/md5-cache/net-misc/teamviewer-15.2.2756
-2011252124 metadata/md5-cache/net-misc/teamviewer-15.3.2682
-2011252124 metadata/md5-cache/net-misc/teamviewer-15.4.4445
 2011252124 metadata/md5-cache/net-misc/teamviewer-15.5.3
 2011252124 metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
 2011252124 metadata/md5-cache/net-misc/throttle-1.2-r1
@@ -53382,8 +53320,6 @@
 2011252124 metadata/md5-cache/net-misc/udpcast-20120424-r1
 2011252124 metadata/md5-cache/net-misc/udpxy-1.0.23.7-r2
 2011252124 metadata/md5-cache/net-misc/uftp-4.10.1
-2011252124 metadata/md5-cache/net-misc/usbip-3.19
-2011252124 metadata/md5-cache/net-misc/usbip-4.13
 2011252124 metadata/md5-cache/net-misc/utelnetd-0.1.11-r2
 2011252124 metadata/md5-cache/net-misc/vconfig-1.9
 2011252124 metadata/md5-cache/net-misc/vde-2.3.2-r6
@@ -53422,21 +53358,26 @@
 2011260209 metadata/md5-cache/net-misc/chrony-4.0
 2011260709 metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
 2011260709 metadata/md5-cache/net-misc/youtube-viewer-9999
-2011280409 metadata/md5-cache/net-misc/Manifest.gz
 2011272009 metadata/md5-cache/net-misc/ip-sentinel-0.12-r1
-2011272009 metadata/md5-cache/net-misc/ipcalc-0.42_p2
-2011272009 metadata/md5-cache/net-misc/libteam-1.31
 2011272209 metadata/md5-cache/net-misc/memcached-1.6.8
-2011280409 metadata/md5-cache/net-misc/minidlna-1.3.0
-2011272009 metadata/md5-cache/net-misc/netifrc-0.7.1-r1
-2011272009 metadata/md5-cache/net-misc/ofono-1.31
-2011272009 metadata/md5-cache/net-misc/packETH-2.1
-2011272009 metadata/md5-cache/net-misc/pipes-1.16.1-r1
-2011272009 metadata/md5-cache/net-misc/udpcast-20200328
 2011271939 metadata/md5-cache/net-misc/unison-2.51.3_p20201024
-2011272009 metadata/md5-cache/net-misc/wakeonlan-0.41-r3
-2011280339 metadata/md5-cache/net-misc/youtube-dl-2020.11.26
-2011280339 metadata/md5-cache/net-misc/youtube-dl-99999999
+2011291139 metadata/md5-cache/net-misc/Manifest.gz
+2011290009 metadata/md5-cache/net-misc/dhcpcd-9.3.4
+2011291139 metadata/md5-cache/net-misc/ipcalc-0.42_p2
+2011290509 metadata/md5-cache/net-misc/ipmiview-2.18.0.201007
+2011291139 metadata/md5-cache/net-misc/keychain-2.8.5
+2011291139 metadata/md5-cache/net-misc/libteam-1.31
+2011291139 metadata/md5-cache/net-misc/minidlna-1.3.0
+2011291139 metadata/md5-cache/net-misc/netifrc-0.7.1-r1
+2011291139 metadata/md5-cache/net-misc/ofono-1.31
+2011291139 metadata/md5-cache/net-misc/packETH-2.1
+2011291139 metadata/md5-cache/net-misc/pipes-1.16.1-r1
+2011291139 metadata/md5-cache/net-misc/udpcast-20200328
+2011290239 metadata/md5-cache/net-misc/usbip-4.13-r1
+2011291139 metadata/md5-cache/net-misc/wakeonlan-0.41-r3
+2011281339 metadata/md5-cache/net-misc/youtube-dl-2020.11.26
+2011291139 metadata/md5-cache/net-misc/youtube-dl-2020.11.29
+2011291139 metadata/md5-cache/net-misc/youtube-dl-9999
 1911091712 metadata/md5-cache/net-nds/led-1.111
 1912052009 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
 2004032241 metadata/md5-cache/net-nds/gssproxy-0.8.2
@@ -53472,16 +53413,13 @@
 2011252124 metadata/md5-cache/net-news/rsstail-2.1
 2011252124 metadata/md5-cache/net-news/rsstail-2.1_p20200310
 2011252124 metadata/md5-cache/net-news/rsstool-1.0.1_rc2
-2011252124 metadata/md5-cache/net-news/snownews-1.5.12-r1
-2011252124 metadata/md5-cache/net-news/snownews-1.5.13
 2011252124 metadata/md5-cache/net-news/snownews-1.6.10
-2011281009 metadata/md5-cache/net-news/Manifest.gz
 2011281009 metadata/md5-cache/net-news/newsboat-2.19-r1
 2011281009 metadata/md5-cache/net-news/newsboat-2.20.1
+2011282009 metadata/md5-cache/net-news/Manifest.gz
 1909180009 metadata/md5-cache/net-nntp/slrn-1.0.3
 2009130709 metadata/md5-cache/net-nntp/brag-1.4.3
 2011061444 metadata/md5-cache/net-nntp/leafnode-1.11.11
-2011252124 metadata/md5-cache/net-nntp/Manifest.gz
 2011252124 metadata/md5-cache/net-nntp/newspost-2.1.1-r3
 2011252124 metadata/md5-cache/net-nntp/nzbget-20.0
 2011252124 metadata/md5-cache/net-nntp/nzbget-21.0
@@ -53493,10 +53431,10 @@
 2011252124 metadata/md5-cache/net-nntp/sabnzbd-3.0.2
 2011252124 metadata/md5-cache/net-nntp/sabnzbd-3.1.0
 2011252124 metadata/md5-cache/net-nntp/sabnzbd-3.1.1
-2011252124 metadata/md5-cache/net-nntp/slrn-1.0.2
 2011252124 metadata/md5-cache/net-nntp/suck-4.3.3-r1
 2011252124 metadata/md5-cache/net-nntp/suck-4.3.4
 2011252124 metadata/md5-cache/net-nntp/tin-2.4.2
+2011282009 metadata/md5-cache/net-nntp/Manifest.gz
 1907151840 metadata/md5-cache/net-p2p/gnut-0.4.28-r1
 1806011708 metadata/md5-cache/net-p2p/tvrss-1.8_beta
 1911232009 metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.6.0
@@ -53552,7 +53490,6 @@
 2011252124 metadata/md5-cache/net-p2p/ktorrent-5.2.0-r1
 2011252124 metadata/md5-cache/net-p2p/litecoind-0.10.4.0
 2011252124 metadata/md5-cache/net-p2p/mktorrent-1.0-r1
-2011252124 metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912
 2011252124 metadata/md5-cache/net-p2p/mldonkey-3.1.7
 2011252124 metadata/md5-cache/net-p2p/ncdc-1.21
 2011252124 metadata/md5-cache/net-p2p/ncdc-1.22.1
@@ -53573,7 +53510,6 @@
 2011252124 metadata/md5-cache/net-p2p/transmission-3.00-r1
 2011252124 metadata/md5-cache/net-p2p/transmission-9999
 2011252124 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.3.1
-2011252124 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
 2011252124 metadata/md5-cache/net-p2p/tremc-0.9.2
 2011252124 metadata/md5-cache/net-p2p/vuze-5.7.6.0
 2011252124 metadata/md5-cache/net-p2p/xmr-stak-2.10.0
@@ -53595,9 +53531,10 @@
 2011252124 metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.4
 2011252124 metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.5
 2011252124 metadata/md5-cache/net-p2p/xmr-stak-rx-9999
-2011260139 metadata/md5-cache/net-p2p/Manifest.gz
 2011260139 metadata/md5-cache/net-p2p/nicotine+-2.1.2
-1808280009 metadata/md5-cache/net-print/c2esp-27
+2011291139 metadata/md5-cache/net-p2p/Manifest.gz
+2011291139 metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912
+2011281639 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
 1802061938 metadata/md5-cache/net-print/cups-bjnp-2.0
 1702282329 metadata/md5-cache/net-print/fax4cups-1.29-r1
 1702282329 metadata/md5-cache/net-print/ink-0.5.1
@@ -53613,10 +53550,8 @@
 2011061540 metadata/md5-cache/net-print/foomatic-db-4.0.20170331
 2011061540 metadata/md5-cache/net-print/foomatic-db-4.0.20180126
 2011061540 metadata/md5-cache/net-print/foomatic-db-4.0.20190226
-2011252124 metadata/md5-cache/net-print/Manifest.gz
 2011252124 metadata/md5-cache/net-print/brlaser-4
 2011252124 metadata/md5-cache/net-print/brlaser-6
-2011252124 metadata/md5-cache/net-print/c2esp-26
 2011252124 metadata/md5-cache/net-print/cndrvcups-common-lb-3.60-r1
 2011252124 metadata/md5-cache/net-print/cndrvcups-common-lb-3.70
 2011252124 metadata/md5-cache/net-print/cndrvcups-lb-3.60-r2
@@ -53654,7 +53589,6 @@
 2011252124 metadata/md5-cache/net-print/hplip-plugin-3.19.12
 2011252124 metadata/md5-cache/net-print/hplip-plugin-3.20.6-r1
 2011252124 metadata/md5-cache/net-print/hplip-plugin-3.20.9
-2011252124 metadata/md5-cache/net-print/libgnomecups-0.2.3-r3
 2011252124 metadata/md5-cache/net-print/libgnomecups-0.2.3-r5
 2011252124 metadata/md5-cache/net-print/libinklevel-0.9.2
 2011252124 metadata/md5-cache/net-print/lm1100-1.0.2a-r1
@@ -53664,8 +53598,9 @@
 2011252124 metadata/md5-cache/net-print/poster-20060221-r3
 2011252124 metadata/md5-cache/net-print/splix-2.0.0_p20130826
 2011252124 metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
+2011290239 metadata/md5-cache/net-print/Manifest.gz
+2011290239 metadata/md5-cache/net-print/c2esp-27
 2009141809 metadata/md5-cache/net-proxy/obfs4proxy-0.0.11-r1
-2011061444 metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
 2011252124 metadata/md5-cache/net-proxy/3proxy-0.8.13
 2011252124 metadata/md5-cache/net-proxy/3proxy-0.9.0
 2011252124 metadata/md5-cache/net-proxy/adzapper-20110915-r2
@@ -53698,8 +53633,6 @@
 2011252124 metadata/md5-cache/net-proxy/mitmproxy-5.1.1
 2011252124 metadata/md5-cache/net-proxy/mitmproxy-5.2-r1
 2011252124 metadata/md5-cache/net-proxy/mitmproxy-5.3.0
-2011252124 metadata/md5-cache/net-proxy/nutcracker-0.2.4
-2011252124 metadata/md5-cache/net-proxy/nutcracker-0.3.0
 2011252124 metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1
 2011252124 metadata/md5-cache/net-proxy/pingtunnel-0.72
 2011252124 metadata/md5-cache/net-proxy/piper-1.14
@@ -53731,8 +53664,9 @@
 2011252124 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r8
 2011252124 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
 2011252124 metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1
-2011271939 metadata/md5-cache/net-proxy/Manifest.gz
-2011271939 metadata/md5-cache/net-proxy/haproxy-2.2.5
+2011291139 metadata/md5-cache/net-proxy/Manifest.gz
+2011291139 metadata/md5-cache/net-proxy/haproxy-2.2.5
+2011290239 metadata/md5-cache/net-proxy/ziproxy-3.3.1-r2
 2011252124 metadata/md5-cache/net-voip/Manifest.gz
 2011252124 metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r2
 2011252124 metadata/md5-cache/net-voip/telepathy-rakia-0.8.0-r1
@@ -53802,14 +53736,13 @@
 2011252124 metadata/md5-cache/net-vpn/tor-0.4.4.6
 2011252124 metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r2
 2011252124 metadata/md5-cache/net-vpn/vpncwatch-1.8.1
-2011252124 metadata/md5-cache/net-vpn/vtun-3.0.3
 2011252124 metadata/md5-cache/net-vpn/vtun-3.0.3-r1
 2011252124 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20201112
 2011252124 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
 2011252124 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200827
 2011262039 metadata/md5-cache/net-vpn/tor-0.4.5.2_alpha
-2011272209 metadata/md5-cache/net-vpn/Manifest.gz
 2011272209 metadata/md5-cache/net-vpn/openvpn-2.5.0-r1
+2011282009 metadata/md5-cache/net-vpn/Manifest.gz
 1808170009 metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0
 1808170009 metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3
 1909122209 metadata/md5-cache/net-wireless/gr-scan-20160211
@@ -54386,11 +54319,9 @@
 2008211039 metadata/md5-cache/sci-calculators/bc-gh-3.1.5
 2010131539 metadata/md5-cache/sci-calculators/bc-gh-3.1.6
 2011222039 metadata/md5-cache/sci-calculators/galculator-2.1.4-r1
-2011252124 metadata/md5-cache/sci-calculators/Manifest.gz
 2011252124 metadata/md5-cache/sci-calculators/calcoo-1.3.18-r1
 2011252124 metadata/md5-cache/sci-calculators/galculator-2.1.4
 2011252124 metadata/md5-cache/sci-calculators/grpn-1.4.0
-2011252124 metadata/md5-cache/sci-calculators/hcalc-1.2-r1
 2011252124 metadata/md5-cache/sci-calculators/hexcalc-1.11-r3
 2011252124 metadata/md5-cache/sci-calculators/keurocalc-1.3.0
 2011252124 metadata/md5-cache/sci-calculators/orpie-1.5.2-r1
@@ -54408,6 +54339,8 @@
 2011252124 metadata/md5-cache/sci-calculators/units-2.19-r1
 2011252124 metadata/md5-cache/sci-calculators/units-2.20
 2011252124 metadata/md5-cache/sci-calculators/wcalc-2.5
+2011290239 metadata/md5-cache/sci-calculators/Manifest.gz
+2011290239 metadata/md5-cache/sci-calculators/hcalc-1.2-r1
 1808262139 metadata/md5-cache/sci-chemistry/xds-bin-20170930
 2002230040 metadata/md5-cache/sci-chemistry/bodr-10
 2002230040 metadata/md5-cache/sci-chemistry/bodr-9-r1
@@ -54510,9 +54443,9 @@
 2011252124 metadata/md5-cache/sci-chemistry/votca-xtp-9999
 2011252124 metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
 2011252124 metadata/md5-cache/sci-chemistry/xyza2pipe-20121001
-2011272109 metadata/md5-cache/sci-chemistry/Manifest.gz
 2011272109 metadata/md5-cache/sci-chemistry/elem-1.0.3-r2
-2011271709 metadata/md5-cache/sci-chemistry/pymol-2.4.0
+2011282309 metadata/md5-cache/sci-chemistry/Manifest.gz
+2011282309 metadata/md5-cache/sci-chemistry/pymol-2.4.0
 1702282330 metadata/md5-cache/sci-electronics/espresso-ab-1.0-r1
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 1704192008 metadata/md5-cache/sci-electronics/labone-16.12.42529
@@ -54525,7 +54458,6 @@
 2010111239 metadata/md5-cache/sci-electronics/kicad-meta-5.1.7
 2011061540 metadata/md5-cache/sci-electronics/fasthenry-3.0_p082514
 2011191339 metadata/md5-cache/sci-electronics/kicad-meta-5.1.8
-2011252124 metadata/md5-cache/sci-electronics/Manifest.gz
 2011252124 metadata/md5-cache/sci-electronics/Stage-4.1.1
 2011252124 metadata/md5-cache/sci-electronics/Stage-4.3.0
 2011252124 metadata/md5-cache/sci-electronics/Stage-9999
@@ -54601,7 +54533,8 @@
 2011252124 metadata/md5-cache/sci-electronics/xcircuit-3.9.73
 2011252124 metadata/md5-cache/sci-electronics/xnec2c-3.5.1
 2011252124 metadata/md5-cache/sci-electronics/xoscope-2.0
-2011252124 metadata/md5-cache/sci-electronics/xoscope-2.1
+2011290239 metadata/md5-cache/sci-electronics/Manifest.gz
+2011290239 metadata/md5-cache/sci-electronics/xoscope-2.2
 1805212239 metadata/md5-cache/sci-geosciences/gshhs-data-2.2.0
 1902251809 metadata/md5-cache/sci-geosciences/harmonics-dwf-free-20131228
 1702282330 metadata/md5-cache/sci-geosciences/harmonics-dwf-free-noncomm-20111230-r1
@@ -54614,7 +54547,6 @@
 2002171539 metadata/md5-cache/sci-geosciences/gshhg-gmt-2.3.7
 2006040939 metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
 2007161939 metadata/md5-cache/sci-geosciences/GeographicLib-1.50.1
-2011252124 metadata/md5-cache/sci-geosciences/Manifest.gz
 2011252124 metadata/md5-cache/sci-geosciences/bt747-2.1.7-r1
 2011252124 metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
 2011252124 metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
@@ -54702,7 +54634,6 @@
 2011252124 metadata/md5-cache/sci-geosciences/qgis-3.16.1
 2011252124 metadata/md5-cache/sci-geosciences/qgis-9999
 2011252124 metadata/md5-cache/sci-geosciences/qmapshack-1.14.0
-2011252124 metadata/md5-cache/sci-geosciences/qmapshack-1.15.0
 2011252124 metadata/md5-cache/sci-geosciences/routino-3.1.1
 2011252124 metadata/md5-cache/sci-geosciences/routino-3.2
 2011252124 metadata/md5-cache/sci-geosciences/routino-3.3.2
@@ -54711,6 +54642,9 @@
 2011252124 metadata/md5-cache/sci-geosciences/viking-1.7
 2011252124 metadata/md5-cache/sci-geosciences/viking-1.7-r1
 2011252124 metadata/md5-cache/sci-geosciences/xtide-2.15.1
+2011281739 metadata/md5-cache/sci-geosciences/Manifest.gz
+2011281739 metadata/md5-cache/sci-geosciences/gpxsee-7.37
+2011281609 metadata/md5-cache/sci-geosciences/qmapshack-1.15.1
 1702282330 metadata/md5-cache/sci-libs/clashscore-db-3.17
 1702282331 metadata/md5-cache/sci-libs/fetk-1.5
 1706010238 metadata/md5-cache/sci-libs/h5part-1.6.6
@@ -55081,7 +55015,6 @@
 2011252124 metadata/md5-cache/sci-libs/tensorflow-2.2.0-r2
 2011252124 metadata/md5-cache/sci-libs/tensorflow-2.3.1
 2011252124 metadata/md5-cache/sci-libs/tensorflow-2.3.1-r1
-2011252124 metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc1
 2011252124 metadata/md5-cache/sci-libs/tensorflow-estimator-2.1
 2011252124 metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r1
 2011252124 metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r2
@@ -55114,9 +55047,10 @@
 2011252124 metadata/md5-cache/sci-libs/xkaapi-3.0.3
 2011252124 metadata/md5-cache/sci-libs/xylib-1.6
 2011261439 metadata/md5-cache/sci-libs/libaec-1.0.4
-2011271209 metadata/md5-cache/sci-libs/Manifest.gz
 2011271209 metadata/md5-cache/sci-libs/indilib-1.8.7
 2011270009 metadata/md5-cache/sci-libs/scikit-learn-0.23.2
+2011290209 metadata/md5-cache/sci-libs/Manifest.gz
+2011290209 metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc3
 1909120939 metadata/md5-cache/sci-mathematics/alt-ergo-1.30
 1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1912080309 metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
@@ -55266,7 +55200,6 @@
 2005151939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
 2007260509 metadata/md5-cache/sci-misc/tango-9.2.5a
 2011061540 metadata/md5-cache/sci-misc/cdfplayer-11.2.0
-2011252124 metadata/md5-cache/sci-misc/Manifest.gz
 2011252124 metadata/md5-cache/sci-misc/apertium-3.2.0
 2011252124 metadata/md5-cache/sci-misc/boinc-7.14.2
 2011252124 metadata/md5-cache/sci-misc/boinc-7.8.6
@@ -55279,8 +55212,6 @@
 2011252124 metadata/md5-cache/sci-misc/gt-itm-19961004-r2
 2011252124 metadata/md5-cache/sci-misc/h5utils-1.12.1-r2
 2011252124 metadata/md5-cache/sci-misc/lttoolbox-3.3.3
-2011252124 metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4
-2011252124 metadata/md5-cache/sci-misc/mendeleydesktop-1.19.5
 2011252124 metadata/md5-cache/sci-misc/mendeleydesktop-1.19.6
 2011252124 metadata/md5-cache/sci-misc/nco-4.5.1-r2
 2011252124 metadata/md5-cache/sci-misc/ncview-2.1.7
@@ -55289,6 +55220,7 @@
 2011252124 metadata/md5-cache/sci-misc/oww-0.86.5
 2011252124 metadata/md5-cache/sci-misc/vitables-3.0.0-r1
 2011252124 metadata/md5-cache/sci-misc/vitables-3.0.0-r2
+2011281639 metadata/md5-cache/sci-misc/Manifest.gz
 1702282331 metadata/md5-cache/sci-physics/siscone-3.0.3
 2011181909 metadata/md5-cache/sci-physics/geant-data-4.10.6-r1
 2011181909 metadata/md5-cache/sci-physics/geant-data-4.10.6.3
@@ -55363,7 +55295,6 @@
 2011252124 metadata/md5-cache/sci-physics/xfoil-6.99
 2011252124 metadata/md5-cache/sci-physics/yoda-1.7.0-r2
 1702282331 metadata/md5-cache/sci-visualization/circos-0.55-r1
-2011252124 metadata/md5-cache/sci-visualization/Manifest.gz
 2011252124 metadata/md5-cache/sci-visualization/epix-1.2.11-r2
 2011252124 metadata/md5-cache/sci-visualization/fig2sxd-0.22.1
 2011252124 metadata/md5-cache/sci-visualization/fityk-1.3.1
@@ -55407,6 +55338,8 @@
 2011252124 metadata/md5-cache/sci-visualization/xgraph-12.1-r4
 2011252124 metadata/md5-cache/sci-visualization/xyscan-4.3.0
 2011252124 metadata/md5-cache/sci-visualization/zhu3d-4.2.6-r1
+2011290209 metadata/md5-cache/sci-visualization/Manifest.gz
+2011290209 metadata/md5-cache/sci-visualization/tensorboard-2.4.0
 2002151740 metadata/md5-cache/sec-policy/selinux-base-policy-2.20190201-r1
 2003191139 metadata/md5-cache/sec-policy/apparmor-profiles-2.13.4
 2009021410 metadata/md5-cache/sec-policy/selinux-base-policy-9999
@@ -56829,7 +56762,6 @@
 2011252124 metadata/md5-cache/sys-apps/mlocate-0.26-r2
 2011252124 metadata/md5-cache/sys-apps/mlocate-0.26-r3
 2011252124 metadata/md5-cache/sys-apps/moreutils-0.63
-2011252124 metadata/md5-cache/sys-apps/moreutils-0.64
 2011252124 metadata/md5-cache/sys-apps/most-5.0.0a-r1
 2011252124 metadata/md5-cache/sys-apps/mount-gtk-1.4.2
 2011252124 metadata/md5-cache/sys-apps/mount-gtk-1.4.4
@@ -56870,7 +56802,6 @@
 2011252124 metadata/md5-cache/sys-apps/pcsc-tools-1.5.6
 2011252124 metadata/md5-cache/sys-apps/pcsc-tools-1.5.7
 2011252124 metadata/md5-cache/sys-apps/pick-3.0.1
-2011252124 metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
 2011252124 metadata/md5-cache/sys-apps/pkgcore-9999
 2011252124 metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r5
 2011252124 metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
@@ -56958,7 +56889,6 @@
 2011252124 metadata/md5-cache/sys-apps/systemd-247_rc2
 2011252124 metadata/md5-cache/sys-apps/systemd-9999
 2011252124 metadata/md5-cache/sys-apps/systemd-readahead-216
-2011252124 metadata/md5-cache/sys-apps/systemd-tmpfiles-246
 2011252124 metadata/md5-cache/sys-apps/sysvinit-2.93
 2011252124 metadata/md5-cache/sys-apps/sysvinit-2.96
 2011252124 metadata/md5-cache/sys-apps/sysvinit-2.97
@@ -57023,7 +56953,6 @@
 2011252124 metadata/md5-cache/sys-apps/zorroutils-0.04
 2011252124 metadata/md5-cache/sys-apps/zorroutils-0.05
 2011261339 metadata/md5-cache/sys-apps/restartd-0.2.2-r1
-2011281009 metadata/md5-cache/sys-apps/Manifest.gz
 2011281009 metadata/md5-cache/sys-apps/bat-0.15.4
 2011281009 metadata/md5-cache/sys-apps/bat-0.17.1
 2011281009 metadata/md5-cache/sys-apps/exa-0.9.0-r1
@@ -57034,6 +56963,11 @@
 2011281009 metadata/md5-cache/sys-apps/lsd-0.18.0
 2011281009 metadata/md5-cache/sys-apps/ripgrep-12.1.1
 2011280309 metadata/md5-cache/sys-apps/texinfo-6.7
+2011290039 metadata/md5-cache/sys-apps/Manifest.gz
+2011281239 metadata/md5-cache/sys-apps/moreutils-0.64
+2011281109 metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
+2011290039 metadata/md5-cache/sys-apps/portage-3.0.11
+2011281439 metadata/md5-cache/sys-apps/systemd-tmpfiles-246
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 2009131039 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
 2009141809 metadata/md5-cache/sys-auth/docker_auth-1.5.0
@@ -57378,7 +57312,6 @@
 2011252124 metadata/md5-cache/sys-cluster/galera-26.4.3
 2011252124 metadata/md5-cache/sys-cluster/galera-26.4.4
 2011252124 metadata/md5-cache/sys-cluster/galera-26.4.5
-2011252124 metadata/md5-cache/sys-cluster/galera-26.4.6
 2011252124 metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1
 2011252124 metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
 2011252124 metadata/md5-cache/sys-cluster/gasnet-1.26.4
@@ -57525,8 +57458,9 @@
 2011261909 metadata/md5-cache/sys-cluster/spark-bin-2.4.3
 2011261909 metadata/md5-cache/sys-cluster/spark-bin-2.4.7-r1
 2011261909 metadata/md5-cache/sys-cluster/spark-bin-3.0.1-r2
-2011272239 metadata/md5-cache/sys-cluster/Manifest.gz
 2011272239 metadata/md5-cache/sys-cluster/singularity-3.7.0
+2011281239 metadata/md5-cache/sys-cluster/Manifest.gz
+2011281239 metadata/md5-cache/sys-cluster/galera-26.4.6
 1910071309 metadata/md5-cache/sys-devel/cons-2.3.0
 1901180209 metadata/md5-cache/sys-devel/slibtool-0.5.28
 1910271939 metadata/md5-cache/sys-devel/ucpp-1.3.4
@@ -57568,13 +57502,9 @@
 2009241639 metadata/md5-cache/sys-devel/automake-1.7.9-r3
 2009241639 metadata/md5-cache/sys-devel/automake-1.8.5-r5
 2009241639 metadata/md5-cache/sys-devel/automake-1.9.6-r5
-2010262009 metadata/md5-cache/sys-devel/llvm-common-10.0.0
 2010262009 metadata/md5-cache/sys-devel/llvm-common-10.0.1
-2010262009 metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999
-2010262009 metadata/md5-cache/sys-devel/llvm-common-12.0.0.9999
 2010262009 metadata/md5-cache/sys-devel/llvm-common-9.0.1
 2011061444 metadata/md5-cache/sys-devel/icecream-1.0.0-r2
-2011090239 metadata/md5-cache/sys-devel/crossdev-20201108
 2011111939 metadata/md5-cache/sys-devel/autoconf-2.70_beta3-r1
 2011172339 metadata/md5-cache/sys-devel/llvm-common-11.0.0
 2011172339 metadata/md5-cache/sys-devel/llvmgold-11
@@ -57618,19 +57548,12 @@
 2011252124 metadata/md5-cache/sys-devel/bison-3.6.4
 2011252124 metadata/md5-cache/sys-devel/bison-3.7.1-r1
 2011252124 metadata/md5-cache/sys-devel/bison-3.7.4
-2011252124 metadata/md5-cache/sys-devel/clang-10.0.0
 2011252124 metadata/md5-cache/sys-devel/clang-10.0.1
 2011252124 metadata/md5-cache/sys-devel/clang-11.0.0
-2011252124 metadata/md5-cache/sys-devel/clang-11.0.0.9999
-2011252124 metadata/md5-cache/sys-devel/clang-12.0.0.9999
 2011252124 metadata/md5-cache/sys-devel/clang-9.0.1
-2011252124 metadata/md5-cache/sys-devel/clang-common-10.0.0
 2011252124 metadata/md5-cache/sys-devel/clang-common-10.0.1
 2011252124 metadata/md5-cache/sys-devel/clang-common-11.0.0
-2011252124 metadata/md5-cache/sys-devel/clang-common-11.0.0.9999
-2011252124 metadata/md5-cache/sys-devel/clang-common-12.0.0.9999
 2011252124 metadata/md5-cache/sys-devel/clang-common-9.0.1
-2011252124 metadata/md5-cache/sys-devel/clang-runtime-10.0.0
 2011252124 metadata/md5-cache/sys-devel/clang-runtime-10.0.1
 2011252124 metadata/md5-cache/sys-devel/clang-runtime-11.0.0
 2011252124 metadata/md5-cache/sys-devel/clang-runtime-11.0.0.9999
@@ -57670,17 +57593,11 @@
 2011252124 metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
 2011252124 metadata/md5-cache/sys-devel/libtool-2.4.6-r6
 2011252124 metadata/md5-cache/sys-devel/libtool-9999
-2011252124 metadata/md5-cache/sys-devel/lld-10.0.0
 2011252124 metadata/md5-cache/sys-devel/lld-10.0.1
 2011252124 metadata/md5-cache/sys-devel/lld-11.0.0
-2011252124 metadata/md5-cache/sys-devel/lld-11.0.0.9999
-2011252124 metadata/md5-cache/sys-devel/lld-12.0.0.9999
 2011252124 metadata/md5-cache/sys-devel/lld-9.0.1
-2011252124 metadata/md5-cache/sys-devel/llvm-10.0.0
 2011252124 metadata/md5-cache/sys-devel/llvm-10.0.1
 2011252124 metadata/md5-cache/sys-devel/llvm-11.0.0
-2011252124 metadata/md5-cache/sys-devel/llvm-11.0.0.9999
-2011252124 metadata/md5-cache/sys-devel/llvm-12.0.0.9999
 2011252124 metadata/md5-cache/sys-devel/llvm-9.0.1
 2011252124 metadata/md5-cache/sys-devel/llvm-roc-3.7.0-r1
 2011252124 metadata/md5-cache/sys-devel/llvm-roc-3.8.0
@@ -57704,16 +57621,25 @@
 2011252124 metadata/md5-cache/sys-devel/sparse-0.6.2
 2011252124 metadata/md5-cache/sys-devel/sparse-9999
 2011262009 metadata/md5-cache/sys-devel/native-cctools-5
-2011271939 metadata/md5-cache/sys-devel/Manifest.gz
 2011271839 metadata/md5-cache/sys-devel/binutils-apple-11.3.1
 2011271939 metadata/md5-cache/sys-devel/bison-3.7.3
 2011271939 metadata/md5-cache/sys-devel/gdb-10.1
 2011271409 metadata/md5-cache/sys-devel/gdb-9999
-2011252124 metadata/md5-cache/sys-fabric/Manifest.gz
+2011291209 metadata/md5-cache/sys-devel/Manifest.gz
+2011291209 metadata/md5-cache/sys-devel/clang-11.0.0.9999
+2011291209 metadata/md5-cache/sys-devel/clang-12.0.0.9999
+2011291209 metadata/md5-cache/sys-devel/clang-common-11.0.0.9999
+2011291209 metadata/md5-cache/sys-devel/clang-common-12.0.0.9999
+2011291209 metadata/md5-cache/sys-devel/lld-11.0.0.9999
+2011291209 metadata/md5-cache/sys-devel/lld-12.0.0.9999
+2011291209 metadata/md5-cache/sys-devel/llvm-10.0.0
+2011291209 metadata/md5-cache/sys-devel/llvm-11.0.0.9999
+2011291209 metadata/md5-cache/sys-devel/llvm-12.0.0.9999
+2011291209 metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999
+2011291209 metadata/md5-cache/sys-devel/llvm-common-12.0.0.9999
 2011252124 metadata/md5-cache/sys-fabric/dapl-2.0.40
 2011252124 metadata/md5-cache/sys-fabric/ibacm-1.0.8
 2011252124 metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
-2011252124 metadata/md5-cache/sys-fabric/infinipath-psm-3.2
 2011252124 metadata/md5-cache/sys-fabric/libcxgb3-1.3.1-r2
 2011252124 metadata/md5-cache/sys-fabric/libcxgb4-1.3.2
 2011252124 metadata/md5-cache/sys-fabric/libehca-1.2.2-r3
@@ -57740,6 +57666,8 @@
 2011252124 metadata/md5-cache/sys-fabric/qperf-0.4.9
 2011252124 metadata/md5-cache/sys-fabric/rds-tools-2.0.4-r3
 2011252124 metadata/md5-cache/sys-fabric/srptools-1.0.2
+2011290239 metadata/md5-cache/sys-fabric/Manifest.gz
+2011290239 metadata/md5-cache/sys-fabric/infinipath-psm-3.2
 1904182339 metadata/md5-cache/sys-firmware/b43legacy-firmware-3.130.20.0
 1702282333 metadata/md5-cache/sys-firmware/bluez-firmware-1.2
 1905300009 metadata/md5-cache/sys-firmware/firmware-imx-5.4
@@ -58019,8 +57947,10 @@
 2011252124 metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc6
 2011252212 metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc7
 2011252124 metadata/md5-cache/sys-fs/zfs-kmod-9999
-2011281009 metadata/md5-cache/sys-fs/Manifest.gz
 2011281009 metadata/md5-cache/sys-fs/sandboxfs-0.2.0
+2011282339 metadata/md5-cache/sys-fs/Manifest.gz
+2011282339 metadata/md5-cache/sys-fs/fuse-overlayfs-1.3.0
+2011281939 metadata/md5-cache/sys-fs/mtools-4.0.26
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-3789.70.16-r5
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-4570.71.2-r5
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-4903.241.1-r5
@@ -58223,12 +58153,12 @@
 2011262309 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.80-r1
 2011262039 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.80-r2
 2011261639 metadata/md5-cache/sys-kernel/linux-firmware-99999999
-2011271939 metadata/md5-cache/sys-kernel/Manifest.gz
-2011271939 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.209
-2011271939 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.160
-2011271939 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.246
-2011271939 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.246
-2011271939 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.80-r1
+2011281239 metadata/md5-cache/sys-kernel/Manifest.gz
+2011281239 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.209
+2011281239 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.160
+2011281239 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.246
+2011281239 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.246
+2011281239 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.80-r1
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
@@ -58252,17 +58182,11 @@
 2011252124 metadata/md5-cache/sys-libs/binutils-libs-2.35.1
 2011252124 metadata/md5-cache/sys-libs/binutils-libs-2.35.1-r1
 2011252124 metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027-r1
-2011252124 metadata/md5-cache/sys-libs/compiler-rt-10.0.0
 2011252124 metadata/md5-cache/sys-libs/compiler-rt-10.0.1
 2011252124 metadata/md5-cache/sys-libs/compiler-rt-11.0.0
-2011252124 metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
-2011252124 metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999
 2011252124 metadata/md5-cache/sys-libs/compiler-rt-9.0.1
-2011252124 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
 2011252124 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1
 2011252124 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0
-2011252124 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999
-2011252124 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0.9999
 2011252124 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.1
 2011252124 metadata/md5-cache/sys-libs/cracklib-2.9.6-r2
 2011252124 metadata/md5-cache/sys-libs/cracklib-2.9.7
@@ -58326,17 +58250,11 @@
 2011252124 metadata/md5-cache/sys-libs/libcap-ng-0.7.11
 2011252124 metadata/md5-cache/sys-libs/libcap-ng-0.8
 2011252124 metadata/md5-cache/sys-libs/libcap-ng-0.8.1
-2011252124 metadata/md5-cache/sys-libs/libcxx-10.0.0
 2011252124 metadata/md5-cache/sys-libs/libcxx-10.0.1
 2011252124 metadata/md5-cache/sys-libs/libcxx-11.0.0
-2011252124 metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
-2011252124 metadata/md5-cache/sys-libs/libcxx-12.0.0.9999
 2011252124 metadata/md5-cache/sys-libs/libcxx-9.0.1
-2011252124 metadata/md5-cache/sys-libs/libcxxabi-10.0.0
 2011252124 metadata/md5-cache/sys-libs/libcxxabi-10.0.1
 2011252124 metadata/md5-cache/sys-libs/libcxxabi-11.0.0
-2011252124 metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
-2011252124 metadata/md5-cache/sys-libs/libcxxabi-12.0.0.9999
 2011252124 metadata/md5-cache/sys-libs/libcxxabi-9.0.1
 2011252124 metadata/md5-cache/sys-libs/libfaketime-0.9.6-r2
 2011252124 metadata/md5-cache/sys-libs/libfaketime-0.9.7
@@ -58349,11 +58267,8 @@
 2011252124 metadata/md5-cache/sys-libs/libixp-0.5_p20110208-r3
 2011252124 metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
 2011252124 metadata/md5-cache/sys-libs/libnih-1.0.3-r4
-2011252124 metadata/md5-cache/sys-libs/libomp-10.0.0
 2011252124 metadata/md5-cache/sys-libs/libomp-10.0.1
 2011252124 metadata/md5-cache/sys-libs/libomp-11.0.0
-2011252124 metadata/md5-cache/sys-libs/libomp-11.0.0.9999
-2011252124 metadata/md5-cache/sys-libs/libomp-12.0.0.9999
 2011252124 metadata/md5-cache/sys-libs/libomp-9.0.1
 2011252124 metadata/md5-cache/sys-libs/libosinfo-1.8.0-r1
 2011252124 metadata/md5-cache/sys-libs/libraw1394-2.1.2-r1
@@ -58393,12 +58308,8 @@
 2011252124 metadata/md5-cache/sys-libs/libvpd-2.2.6
 2011252124 metadata/md5-cache/sys-libs/libvpd-2.2.8
 2011252124 metadata/md5-cache/sys-libs/libxcrypt-4.4.16
-2011252124 metadata/md5-cache/sys-libs/libxcrypt-4.4.17
-2011252124 metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
 2011252124 metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
 2011252124 metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0
-2011252124 metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999
-2011252124 metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0.9999
 2011252124 metadata/md5-cache/sys-libs/llvm-libunwind-9.0.1
 2011252124 metadata/md5-cache/sys-libs/lwp-2.8
 2011252124 metadata/md5-cache/sys-libs/musl-1.1.24
@@ -58435,7 +58346,6 @@
 2011252124 metadata/md5-cache/sys-libs/tdb-1.4.3
 2011252124 metadata/md5-cache/sys-libs/tevent-0.10.2
 2011252124 metadata/md5-cache/sys-libs/timezone-data-2020a
-2011252124 metadata/md5-cache/sys-libs/timezone-data-2020d
 2011252124 metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
 2011252124 metadata/md5-cache/sys-libs/uclibc-ng-1.0.32
 2011252124 metadata/md5-cache/sys-libs/uclibc-ng-1.0.33
@@ -58445,9 +58355,23 @@
 2011252124 metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
 2011252124 metadata/md5-cache/sys-libs/zlib-1.2.11-r2
 2011252124 metadata/md5-cache/sys-libs/zlib-1.2.11-r3
-2011280309 metadata/md5-cache/sys-libs/Manifest.gz
 2011280009 metadata/md5-cache/sys-libs/musl-1.2.1-r1
 2011280309 metadata/md5-cache/sys-libs/ncurses-6.2-r1
+2011291209 metadata/md5-cache/sys-libs/Manifest.gz
+2011291209 metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
+2011291209 metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999
+2011291209 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999
+2011291209 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0.9999
+2011291209 metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
+2011291209 metadata/md5-cache/sys-libs/libcxx-12.0.0.9999
+2011291209 metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
+2011291209 metadata/md5-cache/sys-libs/libcxxabi-12.0.0.9999
+2011291209 metadata/md5-cache/sys-libs/libomp-11.0.0.9999
+2011291209 metadata/md5-cache/sys-libs/libomp-12.0.0.9999
+2011281439 metadata/md5-cache/sys-libs/libxcrypt-4.4.17
+2011291209 metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999
+2011291209 metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0.9999
+2011281639 metadata/md5-cache/sys-libs/timezone-data-2020d
 1902071639 metadata/md5-cache/sys-power/acpi-1.7-r1
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
 1907151840 metadata/md5-cache/sys-power/uhubctl-1.8-r1
@@ -58512,8 +58436,6 @@
 2011040409 metadata/md5-cache/sys-process/parallel-20200922
 2011040509 metadata/md5-cache/sys-process/parallel-20201022
 2011061444 metadata/md5-cache/sys-process/cronbase-0.3.7-r6
-2011240439 metadata/md5-cache/sys-process/parallel-20201122
-2011252124 metadata/md5-cache/sys-process/Manifest.gz
 2011252124 metadata/md5-cache/sys-process/acct-6.6.4-r1
 2011252124 metadata/md5-cache/sys-process/anacron-2.3-r4
 2011252124 metadata/md5-cache/sys-process/at-3.1.23
@@ -58594,6 +58516,8 @@
 2011252124 metadata/md5-cache/sys-process/usbtop-1.0
 2011252124 metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
 2011252124 metadata/md5-cache/sys-process/watchpid-0.1-r2
+2011281209 metadata/md5-cache/sys-process/Manifest.gz
+2011281209 metadata/md5-cache/sys-process/parallel-20201122
 1910111911 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
 1910111911 metadata/md5-cache/virtual/gnustep-back-0.25.0
 1910111911 metadata/md5-cache/virtual/gnustep-back-0.25.1
@@ -58776,7 +58700,6 @@
 2008071909 metadata/md5-cache/virtual/perl-threads-shared-1.610.0
 2008071909 metadata/md5-cache/virtual/perl-version-0.992.400-r1
 2008130639 metadata/md5-cache/virtual/linux-sources-3-r4
-2008171009 metadata/md5-cache/virtual/perl-HTTP-Tiny-0.76.0-r1
 2008171009 metadata/md5-cache/virtual/perl-IPC-Cmd-1.20.0
 2008171009 metadata/md5-cache/virtual/perl-IPC-Cmd-1.40.0
 2008171009 metadata/md5-cache/virtual/perl-Locale-Maketext-Simple-0.210.100_rc-r10
@@ -58800,7 +58723,6 @@
 2010100009 metadata/md5-cache/virtual/awk-1
 2010241239 metadata/md5-cache/virtual/libc-1-r1
 2010241809 metadata/md5-cache/virtual/mpi-2.0-r3
-2010291009 metadata/md5-cache/virtual/tmpfiles-0
 2011072109 metadata/md5-cache/virtual/szip-2.1
 2011121839 metadata/md5-cache/virtual/lapacke-3.8-r1
 2011172209 metadata/md5-cache/virtual/udev-217-r2
@@ -58841,8 +58763,10 @@
 2011252124 metadata/md5-cache/virtual/rubygems-16
 2011252124 metadata/md5-cache/virtual/rust-1.46.0
 2011252124 metadata/md5-cache/virtual/rust-1.48.0
-2011281009 metadata/md5-cache/virtual/Manifest.gz
 2011271939 metadata/md5-cache/virtual/rust-1.47.0
+2011282239 metadata/md5-cache/virtual/Manifest.gz
+2011281239 metadata/md5-cache/virtual/perl-HTTP-Tiny-0.76.0-r1
+2011282239 metadata/md5-cache/virtual/tmpfiles-0
 1808151104 metadata/md5-cache/www-apache/modsec-flameeyes-20130216
 1810260409 metadata/md5-cache/www-apache/modsecurity-crs-3.0.2
 1903040439 metadata/md5-cache/www-apache/modsecurity-crs-3.1.0
@@ -59104,9 +59028,9 @@
 2011252124 metadata/md5-cache/www-client/w3m-0.5.3_p20190105
 2011252124 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r10
 2011252124 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
-2011260139 metadata/md5-cache/www-client/firefox-83.0
-2011272139 metadata/md5-cache/www-client/Manifest.gz
 2011272139 metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2115.31
+2011281709 metadata/md5-cache/www-client/Manifest.gz
+2011281709 metadata/md5-cache/www-client/firefox-83.0
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
 1904231239 metadata/md5-cache/www-misc/wsmake-0.6.4
@@ -59186,7 +59110,6 @@
 2011252124 metadata/md5-cache/www-servers/servefile-0.4.4_p20200211
 2011252124 metadata/md5-cache/www-servers/servefile-0.5.1
 2011252124 metadata/md5-cache/www-servers/sniproxy-0.5.0
-2011252124 metadata/md5-cache/www-servers/sniproxy-0.6.0
 2011252124 metadata/md5-cache/www-servers/thttpd-2.27.1
 2011252124 metadata/md5-cache/www-servers/thttpd-9999
 2011252124 metadata/md5-cache/www-servers/tomcat-7.0.106
@@ -59196,16 +59119,18 @@
 2011252124 metadata/md5-cache/www-servers/tomcat-9.0.38-r1
 2011252124 metadata/md5-cache/www-servers/tomcat-9.0.40
 2011252124 metadata/md5-cache/www-servers/tornado-4.5.3
-2011252124 metadata/md5-cache/www-servers/tornado-6.0.4
 2011252124 metadata/md5-cache/www-servers/uwsgi-2.0.19.1
 2011252124 metadata/md5-cache/www-servers/varnish-6.0.6
 2011252124 metadata/md5-cache/www-servers/varnish-6.3.2
 2011252124 metadata/md5-cache/www-servers/varnish-6.4.0
 2011252124 metadata/md5-cache/www-servers/varnish-6.5.0
 2011252124 metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
-2011262239 metadata/md5-cache/www-servers/gunicorn-20.0.4
-2011271709 metadata/md5-cache/www-servers/Manifest.gz
-2011271709 metadata/md5-cache/www-servers/gatling-0.15
+2011290239 metadata/md5-cache/www-servers/Manifest.gz
+2011282309 metadata/md5-cache/www-servers/gatling-0.15
+2011290009 metadata/md5-cache/www-servers/gatling-0.16
+2011281839 metadata/md5-cache/www-servers/gunicorn-20.0.4
+2011290239 metadata/md5-cache/www-servers/sniproxy-0.6.0-r1
+2011281509 metadata/md5-cache/www-servers/tornado-6.0.4
 2004032241 metadata/md5-cache/x11-apps/luit-20190106
 2011252124 metadata/md5-cache/x11-apps/Manifest.gz
 2011252124 metadata/md5-cache/x11-apps/amlc-0.5.1
@@ -59987,7 +59912,6 @@
 2011252124 metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
 2011252124 metadata/md5-cache/x11-misc/xsnow-1.42-r2
 2011252124 metadata/md5-cache/x11-misc/xsnow-3.0.7
-2011252124 metadata/md5-cache/x11-misc/xsri-2.1.0-r3
 2011252124 metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1
 2011252124 metadata/md5-cache/x11-misc/xssstate-1.1
 2011252124 metadata/md5-cache/x11-misc/xstroke-0.6-r1
@@ -60015,8 +59939,8 @@
 2011262309 metadata/md5-cache/x11-misc/fracplanet-0.5.1
 2011270139 metadata/md5-cache/x11-misc/i3status-2.13
 2011271209 metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12
-2011272009 metadata/md5-cache/x11-misc/Manifest.gz
-2011272009 metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
+2011291139 metadata/md5-cache/x11-misc/Manifest.gz
+2011291139 metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 1803190338 metadata/md5-cache/x11-plugins/pidgin-birthday-reminder-1.7-r1
@@ -60219,8 +60143,9 @@
 2011252124 metadata/md5-cache/x11-plugins/wmxkb-1.2.2-r1
 2011252124 metadata/md5-cache/x11-plugins/wmxres-1.2-r1
 2011261339 metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2
-2011272109 metadata/md5-cache/x11-plugins/Manifest.gz
 2011272109 metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4
+2011281239 metadata/md5-cache/x11-plugins/Manifest.gz
+2011281239 metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.7
 1802161308 metadata/md5-cache/x11-terms/pangoterm-0.0_pre20171111
 2004032241 metadata/md5-cache/x11-terms/eterm-0.9.6-r2
 2005081846 metadata/md5-cache/x11-terms/xfce4-terminal-0.8.9.2
@@ -60243,7 +60168,6 @@
 2011252124 metadata/md5-cache/x11-terms/lilyterm-99999
 2011252124 metadata/md5-cache/x11-terms/mate-terminal-1.24.0
 2011252124 metadata/md5-cache/x11-terms/mate-terminal-1.24.1
-2011252124 metadata/md5-cache/x11-terms/mrxvt-0.5.4
 2011252124 metadata/md5-cache/x11-terms/qterminal-0.14.1-r1
 2011252124 metadata/md5-cache/x11-terms/qterminal-0.15.0
 2011252124 metadata/md5-cache/x11-terms/qterminal-0.16.1
@@ -60268,11 +60192,12 @@
 2011252124 metadata/md5-cache/x11-terms/xterm-360
 2011252124 metadata/md5-cache/x11-terms/xterm-361
 2011252124 metadata/md5-cache/x11-terms/yeahconsole-0.3.4-r1
-2011281009 metadata/md5-cache/x11-terms/Manifest.gz
 2011281009 metadata/md5-cache/x11-terms/alacritty-0.4.3
 2011281009 metadata/md5-cache/x11-terms/alacritty-0.5.0
 2011281009 metadata/md5-cache/x11-terms/alacritty-0.6.0
 2011281009 metadata/md5-cache/x11-terms/alacritty-9999
+2011290239 metadata/md5-cache/x11-terms/Manifest.gz
+2011290239 metadata/md5-cache/x11-terms/mrxvt-0.5.4
 1707301038 metadata/md5-cache/x11-themes/chameleon-xcursors-0.5-r1
 1902221239 metadata/md5-cache/x11-themes/clearlooks-phenix-7.0.1
 1702282336 metadata/md5-cache/x11-themes/comix-xcursors-0.8.2
@@ -60365,11 +60290,9 @@
 2010121339 metadata/md5-cache/x11-themes/e16-themes-1.0.2
 2010181039 metadata/md5-cache/x11-themes/e-flat-theme-0_pre20201018
 2011061540 metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08
-2011252124 metadata/md5-cache/x11-themes/Manifest.gz
 2011252124 metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
 2011252124 metadata/md5-cache/x11-themes/adapta-gtk-theme-3.95.0.11
 2011252124 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.32.0
-2011252124 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1
 2011252124 metadata/md5-cache/x11-themes/adwaita-qt-1.1.1
 2011252124 metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
 2011252124 metadata/md5-cache/x11-themes/arc-icon-theme-20161122
@@ -60462,11 +60385,12 @@
 2011252124 metadata/md5-cache/x11-themes/xcursor-themes-1.0.6
 2011252124 metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
 2011252124 metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1
+2011282039 metadata/md5-cache/x11-themes/Manifest.gz
+2011282039 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1-r1
 2010121339 metadata/md5-cache/x11-wm/e16-1.0.21
 2011252124 metadata/md5-cache/x11-wm/2bwm-0.3
 2011252124 metadata/md5-cache/x11-wm/2bwm-9999
 2011252124 metadata/md5-cache/x11-wm/aewm++-1.1.5-r2
-2011252124 metadata/md5-cache/x11-wm/aewm-1.3.12
 2011252124 metadata/md5-cache/x11-wm/aewm-1.3.12-r1
 2011252124 metadata/md5-cache/x11-wm/amiwm-0.22.01_p20200826
 2011252124 metadata/md5-cache/x11-wm/awesome-3.5.9-r3
@@ -60490,10 +60414,8 @@
 2011252124 metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
 2011252124 metadata/md5-cache/x11-wm/evilwm-1.1.1
 2011252124 metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
-2011252124 metadata/md5-cache/x11-wm/fvwm-2.6.5-r3
 2011252124 metadata/md5-cache/x11-wm/fvwm-2.6.8-r2
 2011252124 metadata/md5-cache/x11-wm/fvwm-2.6.9
-2011252124 metadata/md5-cache/x11-wm/goomwwm-1.0.0
 2011252124 metadata/md5-cache/x11-wm/goomwwm-1.0.0-r1
 2011252124 metadata/md5-cache/x11-wm/goomwwm-9999
 2011252124 metadata/md5-cache/x11-wm/herbstluftwm-0.7.2-r1
@@ -60532,7 +60454,6 @@
 2011252124 metadata/md5-cache/x11-wm/page-1.9.8
 2011252124 metadata/md5-cache/x11-wm/page-1.9.9-r3
 2011252124 metadata/md5-cache/x11-wm/pekwm-0.1.17-r1
-2011252124 metadata/md5-cache/x11-wm/pekwm-0.1.17-r2
 2011252124 metadata/md5-cache/x11-wm/qtile-0.15.1
 2011252124 metadata/md5-cache/x11-wm/qtile-0.16.1
 2011252124 metadata/md5-cache/x11-wm/ratpoison-1.4.8-r1
@@ -60565,9 +60486,10 @@
 2011252124 metadata/md5-cache/x11-wm/xpra-3.0.2-r1
 2011252124 metadata/md5-cache/x11-wm/xpra-3.0.5-r2
 2011252124 metadata/md5-cache/x11-wm/xpra-4.0.4
-2011261339 metadata/md5-cache/x11-wm/Manifest.gz
 2011261339 metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
 2011260709 metadata/md5-cache/x11-wm/sawfish-1.12.90-r1
+2011291139 metadata/md5-cache/x11-wm/Manifest.gz
+2011291139 metadata/md5-cache/x11-wm/pekwm-0.1.17-r2
 2002112051 metadata/md5-cache/xfce-base/xfce4-appfinder-4.14.0
 2003191509 metadata/md5-cache/xfce-base/exo-0.12.11
 2003261841 metadata/md5-cache/xfce-base/garcon-0.6.4-r2
@@ -60675,4 +60597,4 @@
 2011252124 metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r7
 2011252124 metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.6
 2011252124 metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6-r3
-2011281009 metadata/md5-cache/Manifest.gz
+2011291209 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 01566bb38d6d..c9b6eead4db2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Nov 2020 07:30:01 +0000
+Sun, 29 Nov 2020 09:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e9b02a876777..decfba8e9dce 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d0a5ac966387f62964a86ee2beb90115cf221ca2 1606547134 2020-11-28T07:05:34+00:00
+b698bd73d424438f1b68535acef590f553e4892e 1606640339 2020-11-29T08:58:59+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f1c8ee382c6a..aeeebc4fa32d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1606547101 Sat 28 Nov 2020 07:05:01 AM UTC
+1606640701 Sun 29 Nov 2020 09:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 5cc4f5563aa0..26a4e69091e7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Nov 2020 07:08:39 +0000
+Sun, 29 Nov 2020 09:08:36 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 8350ce864f93..d47080a7ea7b 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index dc2e894748a7..89b18e26a7c3 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -2,5 +2,5 @@ AUX c-ares-1.12.0-remove-tests.patch 422 BLAKE2B 37b7a7a85f053d6a2231b46ca244ffb
 DIST c-ares-1.16.1.tar.gz 1374637 BLAKE2B 0d87538f5d6cac5b6b9c92d6ba5525af0e580e6506bee9270318f0951aaccdc7e135b446381e8150241d367789ccf2f73dbb333d45de4dbb5a87af05483063a8 SHA512 4ac2a5d5c6da74eb1d6155c4eadc7127ab1b53a8d13caec41bd6172db5417a79f3ab022e77ba37d8b13da6893d7ced5fd8baf5cc3950a4154b4de8743ad31471
 DIST c-ares-1.17.1.tar.gz 1518701 BLAKE2B 31dac21ecae231e2a201dc1ba954c1a0663a06f93eb8e7e033ca3c6d385f53e07af0b04854739f1ee8a7f0693f67f620143e152ef092b49342c62279a0480905 SHA512 b11887bcc9274d368088e1a8b6aca62414f20675cf0bc58e948f54fa04c327c39dd23cefe7509eec6397db14b550a3f6b77f5c18b3d735b3eef48ce2da1dcd00
 EBUILD c-ares-1.16.1.ebuild 988 BLAKE2B 10888b2bef7f28d894619b3b1613f8e848fef68ce34e1c288ea3d375778e99531005d1b4cf9b24e9f7a64bfe94bea93cfed87dd6faf85d0e743af6d53a1bc54a SHA512 ead0865956916fa988e035a0bf552580df2bb76fffee7ec069835096173a551513858446aedf1511554ca7d0b3f58b570a7c640e1da05e4d3e043389e32ce359
-EBUILD c-ares-1.17.1.ebuild 909 BLAKE2B 47985cae5610ece70313518abb2f7a895c784bc09099b1c985adae0978eaf6f74c7e532469969f4ab6bcec57dea2e7597afe2be053cba27c2490872565611ea5 SHA512 eea590f5e60ac783731176b20ef2832826e6004cd34555ad0afae068d967c41cabc09fe9886589bee5456d203c52303d7cf2f092e5d4d084d31a0129ff69dc5a
+EBUILD c-ares-1.17.1.ebuild 920 BLAKE2B 472f65af10a750d9dc573074180e83fafc7efd24664a99be19fa7fba9e3a2d87509fbbf383132fbe9a78120435d7ed24da65c908246227859301367c3a65cce2 SHA512 fc1b6473028bccecbdca5f51dcfe6a57f6e9f42601d721bbc3f84c3f4faaa0adf2ea14eceea34c199a5c8df458cab0a614d877e79b2e77425adf2c843dcec127
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.17.1.ebuild b/net-dns/c-ares/c-ares-1.17.1.ebuild
index c002bd5d84a1..25041cd6d09c 100644
--- a/net-dns/c-ares/c-ares-1.17.1.ebuild
+++ b/net-dns/c-ares/c-ares-1.17.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://c-ares.haxx.se/"
 SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index cbeb59091676..bf458d2c5cbc 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -3,5 +3,5 @@ AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e
 DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
 EBUILD idnkit-1.0-r2.ebuild 1035 BLAKE2B f1c1f0b78d45d8dd324e496211188a33be3f12e2293df7d835e5ad6ceb71b5c6393398ba046f9cce15af060ff5211658ad348e676bb8417ab3b2fb6df8115415 SHA512 183fd2b7f6330de7e79b073caf961c5388a7c46a91d9d516c8ef9c634a88089122c0c6541bc3ad64318e13eb7904cbaebc8fce58dd3a2c21276f48defc81c3a0
-EBUILD idnkit-2.3.ebuild 642 BLAKE2B c5912f0984cd70da1805e2ff756a035575c5948eeca1edc07b0089141f5b0957215af760c943aba3ae0270c0336c7884590774659c98a8f2798b031bd48359c7 SHA512 dd36ae79d5a4d90aefa16dc832b14faf17031d0082acec30605fe89dfca0fe93318ea6048099af171cc4e93312fd502bf285ceb29c379b10078dbee223717793
+EBUILD idnkit-2.3.ebuild 637 BLAKE2B 0e62a382af08f436d98bf478e1d36785e1031d146206909df275ce9a29b5aec6c112cda9cee438ab58e883908a32cd18378ea59dbe65cdb24e6212f739e77701 SHA512 8eb7e789d24d0d83078fca0b5797845dfdde498ed5a2731635ccc7360db680d45ab78aae3aca3cc02d1541d6f7fc2e428bce85138c0fbaa87fc396c645c3248f
 MISC metadata.xml 246 BLAKE2B 053eb1eb0345156eb262d7eb10e70636fda57808641af19b715d4d323f19127491fe53e1dc7028454bc4af3f5ed282acd8d8632617b65c2003382193716510ca SHA512 02003cbc53a83f024e07311dc98a6255bcaa23c879f9b7da1263261e323c678bcb80fb0f9c3025076eafedaa0a85a52a98e963d37a692e8902bb9c6d68b54390
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index ddff15c12c15..4c007067072a 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://jprs.co.jp/idn/${P}.tar.bz2"
 
 LICENSE="JPRS"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="liteonly static-libs"
 RDEPEND="
 	virtual/libiconv
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 3a00f7ef2896..cc64cf5b3d32 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,5 +1,5 @@
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-utils-1.7.0-r1.ebuild 1194 BLAKE2B bd2ee91e3a1adee034b4864ec624e15531bf27cadd9625744344c5df88a2a5adc0fc6c02045ef36bc4e88042bda9e85ad658c076709cdc413ba5f041dbd9c871 SHA512 a59e00760c948641198c9693f503244b62166cc4f628c1fe49fb6aa3a7abddeb47e616fded6d466e85d982a1d921883d51f0776f88dad3c0162f40d017561b22
-EBUILD ldns-utils-1.7.1.ebuild 1481 BLAKE2B e26d3fea31d6de2b15c15b035699e589dd7b2f40df01a9fa435a0d96d947426cc3db8aa168efb6fb6f645b9035a2d2fd05e0af3d764787137dbe4e3dd5c9dec6 SHA512 c12ba1bdb889e7431c0b69b9f90174f633bb7eacb140fb092c98237a19e2a5da3a1eab3a9ba4492afe94dfba96b4b8f187ea0a45bbe092e0a0d4fba842ede643
+EBUILD ldns-utils-1.7.1.ebuild 1477 BLAKE2B 328eebc9351c221a61e8826ddf6afa4a095f21da009aa4dac5d03c43e60f8407cdd0b81de6e19ed3696fd9f4c11169a7b09f9f7fb9f5cf119394138cf39ce95f SHA512 3bff66b8d5bc9203e4467cc6eca2bb654d2e314aede7692752bcb167cff9f3dfc08027774dafa12388b23a4c08cabcc6d21b0c649fcc5806db1edf6566d5ea3e
 MISC metadata.xml 848 BLAKE2B a31c8bfb2c5a90add80c4f608cdbd02e3bf15126726ed92203425b166ae01cf8240fa040d98ba44991cd315bdb388664692eca5820fc807cf3fddefc7663ffb4 SHA512 6ce3c5421c6e739f0c15a5b7e9120638cddc78fa3d9c2f564acfccd4c98bb3034512ce1a68422ba0ef7896750c1a41e273f2960d9d1f0ffc21c9028342482366
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
index b51adb0c072b..531556705d20 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
 
 REQUIRED_USE="
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 29f783951c5c..837f1020422d 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/itval/Manifest b/net-firewall/itval/Manifest
index 11cf22f0b33d..bc529f3f9294 100644
--- a/net-firewall/itval/Manifest
+++ b/net-firewall/itval/Manifest
@@ -1,4 +1,4 @@
 DIST ITVal-20121104.tar.bz2 71398 BLAKE2B 6d3b67d7089a7c940c54fb5b5f577624ef935ce785c2a81a03f76bf4d4ced5258d55db9d59894b75ed366681e08d390d1293247fe301c3b179af7e6eff5eb607 SHA512 145f464154d0c88e6c43a16a6ea59f3f6f525612c99032bd5acb934975d46568a40b25996a92d63d190afbe2f129010fb7cdb843dced9eae4ec925b97ee17eca
-EBUILD itval-1.2_p20121104-r1.ebuild 631 BLAKE2B ac6aa6dfd12316dc0bfb99845e53422c10e5ef3c3640564663067eb2cd89a73a6eae55a9dddfeefdc5357b8a0970c0744f1dbaf2e6dc0ee4b97183a5532522b4 SHA512 9a3ed396887db59eba994327441d5bd97e7d5648e8e2b7f47ecf283346e56b9f640d14145013b2760ad81407459aec2f89bf24dcd1f3debecac8a16e63c49341
+EBUILD itval-1.2_p20121104-r1.ebuild 630 BLAKE2B d9b45bbba5acb11c642b64f21ac3863c479ac3b05910a29b58bfeaf47c2b1df83027a8f7154dea2a7f318d25005718a35d48af371297b4f3b42b989a76b914c6 SHA512 cfb30b90fbcea40021d3952f36a00e40728fa56110af0ed30c642d3ce7c0b42f9b9306124d4385e0736266b089da28ad01543e2f494544055c0c7b02c0279e61
 EBUILD itval-1.2_p20121104.ebuild 691 BLAKE2B 514e5a504582a5e532b3b345dc781b72e2c098c23772042b001c051c6738f530d6216e58200b78b9f86a82490e67f49e98379df76f3a542ca3676034b29dc8d6 SHA512 6bb6448aaba54292ea29ab788bb5b5da15b09f6b431c3933f98f574005e9ede3fc7bc939253692d42a3194b1a723e5813799ef837be673508bd5a84d8e163324
 MISC metadata.xml 355 BLAKE2B e335014fc880fc7dcddc6b2dd12ee3028a3f6d1743db5f5effaa4bd88ad6970eae01b381850d1baf8824525cf15bd277bbfd3b55ee9ed543064ed26221ca22ec SHA512 5d2237882022cc28ffcf8f5bf3fc1884d7b18bda49ffb6b3b7ae878e0e47e4b775e268601a031e0aecaeae5b1067a61efb3e061f966150bf20189e3a60eb2df5
diff --git a/net-firewall/itval/itval-1.2_p20121104-r1.ebuild b/net-firewall/itval/itval-1.2_p20121104-r1.ebuild
index df5bed658a01..1b641dd80482 100644
--- a/net-firewall/itval/itval-1.2_p20121104-r1.ebuild
+++ b/net-firewall/itval/itval-1.2_p20121104-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/fddl
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index d6504856089c..01c64c2a7cc5 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -4,5 +4,5 @@ DIST psad-2.4.5.tar.bz2 1631602 BLAKE2B 83d5a6811743e56e86984e79f0176db7982243ce
 DIST psad-2.4.6.tar.bz2 2548405 BLAKE2B 7479ce4496343ca988da4dbe82190053385f1a8fa2e190002545c63f2e36283bc84293d932ebe147c9078923fa9e0527b4265fffdb8e1fd99bfc5d9955f9f3cd SHA512 a5de29b9ca0108aa8c6a325b725145f408dc517aeee4654596c7a037762f495a78827c64fc2e9c4284bc8db65caf0321982ecaf02de6d73784c2038e1078f42d
 EBUILD psad-2.2.5.ebuild 1868 BLAKE2B ca63d6b603678cb6dca9023d60ad8b808014e8fe4c5ff0b2c34c95bdfe777cb9f7fe0eebfc7563604ba135e84c96de9940f5b3ca678657a5fcecd5585a35abc8 SHA512 8680fcf2671280bb234b5d840bd93a3754f432d5c212b7752574dfa2af608c70edf8f2d53e910ca2af44a504729ee0cd0948f5cb61b00a115ece06f5dfe1dec2
 EBUILD psad-2.4.5.ebuild 1924 BLAKE2B 95af89c036864eb14580e0bd78767df519bc077817f231894625921bf69ae52cbca2d509f454b0714f2d10731fae1c45b8cb9e8ab50588a178cc96ac583497b2 SHA512 d8b0f17e7ad6d570e8a3aa54d10ae0d921eb324cc1168814c61d8c23b23c5924ae86183c0194914024b21b1db0dc34c0babf7a5ce333959422f99f59ee1c9df4
-EBUILD psad-2.4.6.ebuild 1924 BLAKE2B 95af89c036864eb14580e0bd78767df519bc077817f231894625921bf69ae52cbca2d509f454b0714f2d10731fae1c45b8cb9e8ab50588a178cc96ac583497b2 SHA512 d8b0f17e7ad6d570e8a3aa54d10ae0d921eb324cc1168814c61d8c23b23c5924ae86183c0194914024b21b1db0dc34c0babf7a5ce333959422f99f59ee1c9df4
+EBUILD psad-2.4.6.ebuild 1918 BLAKE2B f88fbff9567e965b1b38aeabca90f699c42a538c07f061a1dab2078195adf15cbd85adf60cb3e59748dcdae567e3ee66e6afd5b2052c21f4399246786c86d069 SHA512 a2f92b38d4fc1d07d88ea69ec9049cbc2c4390e6065b0cc016007dd8c33f4b771b675e46b41f43e52647f8870ce3d0204d60b4843eb616b3c91d9604119b801b
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-firewall/psad/psad-2.4.6.ebuild b/net-firewall/psad/psad-2.4.6.ebuild
index f4eea7be20fb..56c4275fdd57 100644
--- a/net-firewall/psad/psad-2.4.6.ebuild
+++ b/net-firewall/psad/psad-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.cipherdyne.org/psad/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
 RDEPEND="
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index d1833d29aad8..f550f02f26de 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/gproftpd/Manifest b/net-ftp/gproftpd/Manifest
index df0abc582349..20f65776869d 100644
--- a/net-ftp/gproftpd/Manifest
+++ b/net-ftp/gproftpd/Manifest
@@ -3,5 +3,5 @@ AUX gproftpd-8.3.2-fno-common.patch 509 BLAKE2B d4dff154f0f15426e3f6c7cf610626c1
 AUX gproftpd-8.3.2-install.patch 1791 BLAKE2B 8d2b3ef4e3f3a70a0ed887cd384e8f58a8b02886aee541f850451317fc09100c49154cb73d1b5f586d4c3d8736fccab2218b85fb8864ddf7e9e8344e93de6868 SHA512 bd19623a3ac000a9055d3d79078d3e9fe142d0da342cb30cf53cb04ff5ec849ca040787f0f3271526b7af12bf9b48466eedcdd48dee5b114c9113bf8e43ca18c
 DIST gproftpd-8.3.2.tar.gz 605797 BLAKE2B 76d15fb01fb73ebbb639e4ecc6ddf8399ef5bc2b904fb5d2ae433aa14c40db49d9b352ffdf558d45aa784b21e5248dfc453d2f87863c3c886dc2cd6c746d6109 SHA512 71a3b80b2bf18ec17719b1484d45fb6110764d28492edafcd97538ad99ad7cc182ed25723b721226329b61f29e511b48e0153cf01f90c3c7f5ce939f7b233f59
 EBUILD gproftpd-8.3.2-r1.ebuild 1464 BLAKE2B e6ac1423d2b72bcd3af9f0b34bea695d675568a313a2131e14b775f68c2ead076f4a03d4173c430f397a9f5d3ac3279c6233ebc5d5b4ce31a08c1a786ea17c69 SHA512 499040c17b64e7d89c79e681df93664dd422caa0b140b8680f7ec514b40cb1bd2448c211af1f575c120399cfac1acd87bf1d910f989aabf430fe6c6433dc1523
-EBUILD gproftpd-8.3.2-r2.ebuild 1070 BLAKE2B 3dc38e21f686b2d8c5bea85f40978218407b0ce64912bf2a618b04692bebcff3992451a75f12948664250e28d262730e86a9c690c18e53293b82cf19b2cae675 SHA512 d20be32a018a655f1fc0b82f1e5cf7ee5bcab7fa0130f9444b9708685c97285856ba26a95e8fef475e79f9a5c0236232044c39f0df8ca3b875005a803639ffe2
+EBUILD gproftpd-8.3.2-r2.ebuild 1068 BLAKE2B 751f38644d391d0a0b0dfebec9ee4af20cc599ab1912dd59c1e3ff031a6b8bf9be6e1d4c6ef6b6c57a7991a27a21ee23dcdd1274e4d4b292a8506a79bced53f2 SHA512 936d83542cfca6ac2af1c1671f62c3c91d28143c7c18e2f4188df97788292e0864561cafa428da2a0acb341c92dce64e3a00b22f09a84dab05df732f6587107c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
index 9f6648c9fb75..ad2fc0d7dc3c 100644
--- a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
+++ b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="GTK frontend to proftpd"
 HOMEPAGE="https://mange.dynalias.org/linux/gproftpd"
 SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 0ad44eb5be64..e72591100ffa 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
deleted file mode 100644
index 83296ae87067..000000000000
--- a/net-im/kadu/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX kadu-4.3-compilation.patch 1149 BLAKE2B d5dd28cb8413f5880c839dda594ca650680e5665fae5ce75930a02cca4cd6aa6fc710f29a424db5781301d59b14e86aa049441fe85d97655c06bbce17772fb97 SHA512 d844930c008ec12a2ebd1e746b4167da7bb6417720aa9c5742edd3209400bfc595f03e0f4e9a772c66e80ed8ad4238c7fce000d6f1d0ccb4cd6912f71d1a5a2f
-AUX kadu-4.3-do-not-force-ccache.patch 635 BLAKE2B c1b29e41186a05ee7c34b7f2c349095c9e1a12584defd393a0952a6b6c5015ae401cd0a7b8d4579eabe05e4d771aabaa51fba3ccef49d05cf7c0ff702739f893 SHA512 d17b7a20d78c8446d845bdb80c4a110adb164d0dfaff52f5a67730a3e1d861f65ccb84d67d04cc7088169b6d3d56376c8c43b3c432795a273a0da5517eabd86b
-AUX kadu-4.3-find-x11-with-newer-cmake-modules.patch 2155 BLAKE2B 0709979d6c2e30a40f5e6de7f83c7ae1e991e639d85b30c0b012a736f6c4bf30b0b5f6e6f4f5ffdbf380bbff109709a8b2671a8f0237634c9809856d206e9a87 SHA512 861a5718990df106ec7edc408b29215b2bca0597bf1505fac49cddd3059da6228df82e98da752ce436e174f702d8996d5454ecf4a67fc1e05b6b284d4f341369
-AUX kadu-4.3-fix-plugins-rpath.patch 473 BLAKE2B 8b7c16e7acecb59798a52c514e9f472c13eeda3c005ae84026d13737362435d7381f302a48d87ec15853067bb1e46699803cdc3ba4de54aa1f67f0f4d3d84023 SHA512 af94cb0127abd7ffe6ebd9fea20d17efb835773a6e8194caddd07b736e84e2ee40da51b820ec38e8eb07de6755941b53ded07f9b8aa9a7acd28b612c3259f952
-AUX kadu-4.3-gcc7.patch 266 BLAKE2B 1211251304c10c46df75d3fbc84dff1f560c89a533c8119b80f03d21f8d25def87a32380cb5291d31c3695d706e431fc3fc95c4a35bb8fda9c2c5a0324d257df SHA512 04911ccf7d414a4449634e164ab1c093baa8b05b189a252b8a61bf0f4ad9857e08780620c946524a2d0d4696a6785c0789cbe2ad6f87b2330a093d351df4f982
-DIST kadu-4.3.tar.bz2 8087786 BLAKE2B b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9
-EBUILD kadu-4.3-r2.ebuild 2743 BLAKE2B 596bf99004d8435affddb5051f4f2c1536daf9bac35a4e052e1410b5cbf1581a8ee617614fc9c34eff8ba8bebeea0781af9b2edcecb0f00e4b8b9662054c6b2b SHA512 b167fc71bfc8777a8ed88f194f587de7bfacaa66041911e3de9f869ede3bdbe01bb803b2b21393eeeb781c039c56b6e43473763d6c807400641d47ae8aada11d
-MISC metadata.xml 578 BLAKE2B c6454fd583cf3ee9d55963cc482349eb236a46420d956ed7fe199721c81177e4f32c133279a49c71f5a5f64541efdb3ff8933753b3de868562b74a48eb7093c7 SHA512 23b011af6a0bcc235ca6685aeb1ec01cd9ef1e529fb5970860aab059fc1063d39d36446e3b86542ce303becc991e6250d58ec599aeddef6343382956c55a6c89
diff --git a/net-im/kadu/files/kadu-4.3-compilation.patch b/net-im/kadu/files/kadu-4.3-compilation.patch
deleted file mode 100644
index b9cd0c582889..000000000000
--- a/net-im/kadu/files/kadu-4.3-compilation.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN kadu-4.3/kadu-core/gui/widgets/avatar-painter.cpp kadu-my/kadu-core/gui/widgets/avatar-painter.cpp
---- kadu-4.3/kadu-core/gui/widgets/avatar-painter.cpp	2017-01-24 22:36:21.000000000 +0100
-+++ kadu-my/kadu-core/gui/widgets/avatar-painter.cpp	2020-10-22 23:57:41.486490926 +0200
-@@ -22,6 +22,7 @@
- 
- #include <QtCore/QModelIndex>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPixmap>
- #include <QtGui/QPixmapCache>
- #include <QtWidgets/QStyleOptionViewItem>
-diff -ruN kadu-4.3/kadu-core/plugin/state/plugin-state.test.cpp kadu-my/kadu-core/plugin/state/plugin-state.test.cpp
---- kadu-4.3/kadu-core/plugin/state/plugin-state.test.cpp	2017-01-24 22:36:21.000000000 +0100
-+++ kadu-my/kadu-core/plugin/state/plugin-state.test.cpp	2020-10-23 00:06:51.167189202 +0200
-@@ -34,7 +34,7 @@
- 
- void PluginStateTest::newTest()
- {
--	QCOMPARE(pluginStateToString(PluginState::New), {});
-+	QCOMPARE(pluginStateToString(PluginState::New), QString{});
- 	QCOMPARE(stringToPluginState(""), PluginState::New);
- 	QCOMPARE(stringToPluginState("New"), PluginState::New);
- 	QCOMPARE(stringToPluginState("Invalid"), PluginState::New);
diff --git a/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch b/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch
deleted file mode 100644
index 2511f3c42b99..000000000000
--- a/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ruN kadu-4.3/CMakeLists.txt my/CMakeLists.txt
---- kadu-4.3/CMakeLists.txt	2017-01-24 22:36:21.000000000 +0100
-+++ my/CMakeLists.txt	2017-11-03 03:00:07.005162047 +0100
-@@ -75,13 +75,6 @@
- 	endif ()
- endif ()
- 
--## CCache is cool stuff to improve compilation time
--find_program (CCACHE_FOUND ccache)
--if (CCACHE_FOUND)
--	set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
--	set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
--endif (CCACHE_FOUND)
--
- # Look above, DEBUG_ENABLED is always enabled in Debug configuration.
- # Enable it in all configurations when ENABLE_DEVELOPER_BUILD is on.
- if (ENABLE_DEVELOPER_BUILD)
diff --git a/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch b/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch
deleted file mode 100644
index ec44a0be7f55..000000000000
--- a/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ruN kadu-4.3/kadu-core/CMakeLists.txt my/kadu-core/CMakeLists.txt
---- kadu-4.3/kadu-core/CMakeLists.txt	2017-01-24 22:36:21.000000000 +0100
-+++ my/kadu-core/CMakeLists.txt	2019-11-22 02:05:51.381540018 +0100
-@@ -111,7 +111,7 @@
- list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${LibArchive_LIBRARIES})
- 
- if (UNIX AND NOT APPLE)
--	find_package (X11 REQUIRED COMPONENTS X11 Xutil Xfixes)
-+	find_package (X11 REQUIRED COMPONENTS Xutil Xfixes)
- 	if (X11_FOUND AND X11_Xutil_FOUND AND X11_Xfixes_FOUND)
- 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xfixes_LIB}")
- 	else ()
-diff -ruN kadu-4.3/plugins/idle/CMakeLists.txt my/plugins/idle/CMakeLists.txt
---- kadu-4.3/plugins/idle/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
-+++ my/plugins/idle/CMakeLists.txt	2019-11-22 02:06:57.503381610 +0100
-@@ -15,7 +15,7 @@
- )
- 
- if (UNIX AND NOT APPLE)
--	find_package (X11 REQUIRED COMPONENTS X11 Xutil Xscreensaver)
-+	find_package (X11 REQUIRED COMPONENTS Xutil Xscreensaver)
- 	if (X11_Xscreensaver_FOUND)
- 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xscreensaver_LIB}")
- 	else ()
-diff -ruN kadu-4.3/plugins/pcspeaker/CMakeLists.txt my/plugins/pcspeaker/CMakeLists.txt
---- kadu-4.3/plugins/pcspeaker/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
-+++ my/plugins/pcspeaker/CMakeLists.txt	2019-11-22 02:07:45.315719788 +0100
-@@ -15,7 +15,7 @@
- set (LIBRARIES "")
- 
- if (UNIX AND NOT APPLE)
--	find_package (X11 REQUIRED COMPONENTS X11)
-+	find_package (X11 REQUIRED)
- 	if (NOT X11_FOUND)
- 		message (SEND_ERROR "Could NOT find X11")
- 	endif ()
-diff -ruN kadu-4.3/plugins/screenshot/CMakeLists.txt my/plugins/screenshot/CMakeLists.txt
---- kadu-4.3/plugins/screenshot/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
-+++ my/plugins/screenshot/CMakeLists.txt	2019-11-22 02:07:54.323972436 +0100
-@@ -30,7 +30,7 @@
- 
- if (UNIX AND NOT APPLE)
- 	set (PLUGIN_ADDITIONAL_QT_MODULES X11Extras)
--	find_package (X11 REQUIRED COMPONENTS X11 Xext Xshape)
-+	find_package (X11 REQUIRED COMPONENTS Xext Xshape)
- 	if (X11_Xshape_FOUND)
- 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xext_LIB}")
- 	else ()
diff --git a/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch b/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch
deleted file mode 100644
index bb171af5f41b..000000000000
--- a/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN kadu-4.3/cmake/KaduMacros.cmake my/cmake/KaduMacros.cmake
---- kadu-4.3/cmake/KaduMacros.cmake	2017-01-24 22:36:21.000000000 +0100
-+++ my/cmake/KaduMacros.cmake	2017-11-03 03:24:17.827054622 +0100
-@@ -221,7 +221,7 @@
- 
- 	if (NOT WIN32)
- 		set_target_properties (${KADU_PLUGIN_NAME} PROPERTIES
--			INSTALL_RPATH "${KADU_INSTALL_LIB_DIR}/kadu"
-+			INSTALL_RPATH "${KADU_INSTALL_PREFIX}/${KADU_INSTALL_LIB_DIR}/kadu"
- 			BUILD_WITH_INSTALL_RPATH TRUE
- 		)
- 	endif ()
diff --git a/net-im/kadu/files/kadu-4.3-gcc7.patch b/net-im/kadu/files/kadu-4.3-gcc7.patch
deleted file mode 100644
index 097157f98c77..000000000000
--- a/net-im/kadu/files/kadu-4.3-gcc7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-+++ b/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-@@ -20,6 +20,7 @@
- #pragma once
- 
- #include <QtCore/QObject>
-+#include <functional>
- #include <map>
- #include <set>
- 
diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild
deleted file mode 100644
index d2e585826dd9..000000000000
--- a/net-im/kadu/kadu-4.3-r2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils flag-o-matic gnome2-utils virtualx
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client"
-HOMEPAGE="http://www.kadu.net"
-SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="+gadu mpd otr sdk speech spell xmpp"
-REQUIRED_USE="
-	|| (
-		gadu
-		xmpp
-	)
-"
-COMMON_DEPEND="
-	>=app-arch/libarchive-2.6[lzma]
-	>=dev-libs/injeqt-1.1.0
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qttest:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.12.2[threads] )
-	mpd? ( media-libs/libmpdclient )
-	otr? (
-		>=dev-libs/libgcrypt-1.2.2:0
-		>=net-libs/libotr-4.1.0
-	)
-	spell? ( app-text/enchant:0 )
-	xmpp? (
-		net-dns/libidn:*
-		>=net-libs/qxmpp-0.9.3-r1
-		sys-libs/zlib
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	speech? ( app-accessibility/powiedz )
-"
-
-PLUGINS='
-antistring
-auto_hide
-autoaway
-autoresponder
-autostatus
-cenzor
-chat_notify
-config_wizard
-docking
-docking_notify
-emoticons
-exec_notify
-ext_sound
-filedesc
-firewall
-freedesktop_notify
-hints
-history
-idle
-imagelink
-last_seen
-mediaplayer
-mprisplayer_mediaplayer
-pcspeaker
-screenshot
-simpleview
-single_window
-sms
-sound
-sql_history
-tabs
-word_fix
-'
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3-do-not-force-ccache.patch"
-	"${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch"
-	"${FILESDIR}/${PN}-4.3-gcc7.patch"
-	"${FILESDIR}/${PN}-4.3-find-x11-with-newer-cmake-modules.patch"
-	"${FILESDIR}/${PN}-4.3-compilation.patch"
-)
-
-src_configure() {
-	# Filter out dangerous flags
-	filter-flags -fno-rtti
-	strip-unsupported-flags
-
-	# Ensure -DQT_NO_DEBUG is added
-	append-cppflags -DQT_NO_DEBUG
-
-	# Plugin selection
-	use gadu && PLUGINS+=' gadu_protocol'
-	use mpd && PLUGINS+=' mpd_mediaplayer'
-	use otr && PLUGINS+=' encryption_otr'
-	use speech && PLUGINS+=' speech'
-	use spell && PLUGINS+=' spellchecker'
-	use xmpp && PLUGINS+=' jabber_protocol'
-
-	# Configure package
-	local mycmakeargs=(
-		-DCOMPILE_PLUGINS="${PLUGINS}"
-		-DENABLE_TESTS=OFF
-		-DNETWORK_IMPLEMENTATION="Qt"
-		-DINSTALL_SDK=$(usex sdk)
-		-DWITH_ENCHANT=$(usex spell)
-	)
-	unset PLUGINS
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml
deleted file mode 100644
index 6bf7f3370862..000000000000
--- a/net-im/kadu/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>reavertm@gentoo.org</email>
-		<name>Maciej Mrozowski</name>
-	</maintainer>
-	<use>
-		<flag name="gadu">Enables Gadu communication protocol</flag>
-		<flag name="mpd">Enables Music Player Daemon support</flag>
-		<flag name="otr">Enable char encryption via OTR library</flag>
-		<flag name="sdk">Install Kadu SDK (cmake module, API headers)</flag>
-		<flag name="speech">Enables speech module</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 2427f23966db..0922a379b6ec 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -8,5 +8,5 @@ DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971
 DIST zoom-5.4.54779.1115_x86_64.tar.xz 45216096 BLAKE2B a65c7db96ac0ea5a99b6edba0145d766395ebd67402f28ee276e1a2ed87ca9c9c01bedef12eb4d99a6525f0ec0698de1471c3ca620e32ec29ada5b8edd55416c SHA512 e859060592dc110ccb42760fff54f632b079124ff2b8988e55dfd27d70b132b035d6b0ef8eec83b7d90ddf56a6e675dac4d04c29bec9faab377db4926fb2462d
 EBUILD zoom-5.3.472687.1012.ebuild 2877 BLAKE2B e477df27c26d6b7db8026f8120437bf2db5388acfc0074c497e3a7777de258c25a0d2415f9af04dfc7d49b5b183e70d25b6c53885cd0b45d5d57f86e02105c29 SHA512 fcf0c2c6d8864c30746ecd724fde4147639a62df59d5681f0b5b69cb1552a8df8971e9ed69ee064e1313cc1db6f029fd598675c37982ea66d52a607d3e368933
 EBUILD zoom-5.4.53391.1108.ebuild 2907 BLAKE2B 2ffd91cf8d742abf204d28736f2a63d3de3c370f465bdae217abb3a105fc7119d48e885f00c60bfc3303d4a4b3f678f2d406638c9dcd6b97db11840b5ec3b5e0 SHA512 5342ac23469035178db2ff8bb889f056ea7274929951c54c5e3700e8da8b1c8de96e7f6ea5478ebdfd57ee6134ea799c270c453165ee71c3d83903dcdc86bf53
-EBUILD zoom-5.4.54779.1115-r2.ebuild 4194 BLAKE2B a3ef243bcffd3c9ad0d7341718fcf2d9ed6c4b17767f2f0ff3d7e31f27478e7660b118222ab971b4c7a69fcb8dec6b5b965b2c4a6030eb2c94b68d1d175d2ba8 SHA512 2ae05882bcf3d646a91d20eabe2cfc7a200637791f731465c729ff3a90942f6caf5af64ab554af9b26b7269168a2cbc12872c4ff70bb17527d127a293739d1e4
+EBUILD zoom-5.4.54779.1115-r3.ebuild 4223 BLAKE2B e94321407cbb564771a8e739dd9fb80c6cb4cf206573ba2f4dff4280b659ad5996b21299490491c637ded79d2096242110ba429845c67b8f35e18bb3597e2a40 SHA512 1d4778df513c9be49862013123d7ac7fde014d7517ad40ab843c5c5692c7090a61261ab526e2ee3808fad655b371e8dd7b1898fcf54461337f85d67384c45807
 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/zoom-5.4.54779.1115-r2.ebuild b/net-im/zoom/zoom-5.4.54779.1115-r3.ebuild
similarity index 96%
rename from net-im/zoom/zoom-5.4.54779.1115-r2.ebuild
rename to net-im/zoom/zoom-5.4.54779.1115-r3.ebuild
index 0c671e63dbbc..70da5021389e 100644
--- a/net-im/zoom/zoom-5.4.54779.1115-r2.ebuild
+++ b/net-im/zoom/zoom-5.4.54779.1115-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eapi8-dosym readme.gentoo-r1 xdg-utils
+inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils
 
 DESCRIPTION="Video conferencing and web conferencing service"
 HOMEPAGE="https://zoom.us/"
@@ -107,7 +107,7 @@ src_install() {
 		)
 	fi
 
-	dosym8 -r /opt/zoom/ZoomLauncher /usr/bin/zoom
+	make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "")
 	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
 		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
 	# The tarball doesn't contain an icon, so take a generic camera icon
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 6eb5cec082da..76ca0b341463 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/emech/Manifest b/net-irc/emech/Manifest
index d617ece45ba5..8cfee984add2 100644
--- a/net-irc/emech/Manifest
+++ b/net-irc/emech/Manifest
@@ -2,5 +2,5 @@ AUX emech-3.0.99_p3-buildfix.patch 2732 BLAKE2B b5af908f431049c8e3f5d631477a6276
 DIST emech-3.0.3.tar.gz 228709 BLAKE2B 596c2d757438e1ed08ecb96927258cbd1afcc6105831c336b5df4b22716fdeb2a3215678589c6d9898ad39979d6039cccb12f0af88183ac5fa1c9c1ce86c5102 SHA512 ffe478c0c1800c8afb7afca62dbe08fce6af25a5878ca5fb44bb1271a302d11b96263c51a3848996db8f33f1cdab60d86c26d571d6342fe1505d4dcff83803a3
 DIST emech-3.0.99p3.tar.gz 249209 BLAKE2B 8ff0806275f7b1c9e49bb2eeda2afa0ac94b894426a2f56508492f970070e4141f14f88ffb3c1c46855817c405d29454cf85ebba53c85b4038d7d9d079f4dff6 SHA512 8ce6f8889e060791ab3af6fa63623469a457c436b4e23c51dcd1833fd09e7692270a324ad1d15beb4ad390e9d481267a8ea60eb17c9fd3195b5ad0daf7341165
 EBUILD emech-3.0.3-r1.ebuild 1744 BLAKE2B bd0fb4258a8715b1e34a0f9c556fbdedf93693982cebcd298a7b599d0bf727ba3a756b7276e2b0af1f8258fcdd576cd355c34a17580107eb05e96490c0f04a08 SHA512 539b9210d9a03e16c3350d706fa6042fd3d16de8b57397b1c28ce39ef88f7d526d2c89da51ddb41085c915fc6a378a3bc7e705417aca88e177112563b6cd09a2
-EBUILD emech-3.0.99_p3.ebuild 1807 BLAKE2B 6602027a08cd541e2b53bd8d5456ab6396896dd7f5f02c8433b7209108462b5307252ec22446cb860c039fbfb2c5904705c577956161e4d876dbe6f854e23454 SHA512 4664015a8f1d0f366061d3d79a00c8540b32313bc406a04a15f70f8338494e0046b702fee25a1b7736e978783536d71cdeadb1504fb351798834b023cd32b813
+EBUILD emech-3.0.99_p3.ebuild 1806 BLAKE2B a536d2e792a03c8870e5d79dda63a890369905a531e384f2c3a6998d340210f858e678832ec683aa820c88824655d13c705fa3ab4750ffa308259be3e75f1ec2 SHA512 24afd8e01e07c674b79245ddb9b11ca13e9815727309ca8df2de3984fd5c3c12458f2ee57f46ff629f07e7bc5dcd80acfdf8c7cf8c0499f4304b66db353e7fdb
 MISC metadata.xml 375 BLAKE2B 62804e73401c54751bf6394037337c2c93f95caedc8ada8ce64ff872e6c59622fb64ceabdd47df9f636de180c6bc08a75804be3a90791b6b646120470096a52a SHA512 19c676648690f2f4eac811f15d774ec9a85b9e1ce475944fd2d4dd9cca253bc10efd74f6988479f3d95828e56b790b1759002db272e8918768fba7b70f9f48a5
diff --git a/net-irc/emech/emech-3.0.99_p3.ebuild b/net-irc/emech/emech-3.0.99_p3.ebuild
index 134e49980a28..dcfb74ec059d 100644
--- a/net-irc/emech/emech-3.0.99_p3.ebuild
+++ b/net-irc/emech/emech-3.0.99_p3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.energymech.net/files/${P/_/}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE="debug session tcl"
 S="${WORKDIR}/${P/_/}"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 2de7821b6349..849ee25664df 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
index d505456fdb66..db3d70d52d4f 100644
--- a/net-libs/cppzmq/Manifest
+++ b/net-libs/cppzmq/Manifest
@@ -3,5 +3,5 @@ AUX cppzmq-use-system-catch2.patch 784 BLAKE2B 15ad4fe99048651d9b1f00fb43e1da428
 DIST cppzmq-0_pre150606.tar.xz 4032 BLAKE2B 80918dc148d22a4ddced41bd9dbec2a39f5d69d73724177b186fda490b899ed7dbeaa5aa67a348411b5a34948b167f8def6dfe688a9facd2d56ca6fe41df32d3 SHA512 d5ab584989f0eec7ce227de4534820f6e00582b8f45ebab5472c8244823a14a89e74005edb8ae933037a1df9684cc21641cd271a147f39577331b96474927efe
 DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B 282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0 SHA512 f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027
 EBUILD cppzmq-0_pre150606.ebuild 664 BLAKE2B a782f9142c209224fde2b68505866e0901e7bed600cd0df3ff572aafd88b31b2aab08c9bc30ad2653d3ca1d61d56dc2b0912a85032370eadb48636b1502ce6d4 SHA512 9cc680f474dd763f3718d2d72d59f58215b8e058b7899fb3be2eb6bba79c05c5255f401407c1e97ac91a5bcb2ba7c7ee9ec5bd056a36b12993588f8f815445cc
-EBUILD cppzmq-4.6.0.ebuild 1025 BLAKE2B 291900a7e79d2317bd252263dfcefc7571bd5034f9a02b7b62f9510868a2c40fdb35839b9b4aef9f735344c7dd721ca510a5ed40b2223ad5708d587f4418e8f0 SHA512 5cbcbc96be8bd9d2113b6743d18a9add2cb1bafcbb7d95fa7e5750ab7510ae55109fdb6ef098dd03b7f2c5b9597491879c0bbc19c00bb364857aa81addb98d1b
+EBUILD cppzmq-4.6.0.ebuild 1024 BLAKE2B fff151f3e590555d86f1875ad80a82111549f8253f68bf7f0e204046e0208a204a45bc0ea54ef9b4a887a09ac3f0680832645eb758dba2b0c6b5ed81ac04fdc2 SHA512 9c31c076f6a8c50aa1cc0c4753569ed013b01e30b60ac7050ec9cd6f5de131347d6cbd177945174b15845d79f4fc6dd577fc9b0779c8140cbd0d5e8e54d7fd5e
 MISC metadata.xml 341 BLAKE2B cebd14f5acb08924cfe8941e5ca4c5ff7894e2d52e5f8dbb9a9d648681b6dc7b68b6949e19497fdf34af84eff780e8b52e282d4b5eb48bc110e18f5538eee84c SHA512 20bc14d462ee04fe3bce142640dacf724ff8970bb23e71f97bad89a2837cd0184d77304f34faa8780436c1824d458433d4b0ad644150234d7b11be094963131b
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
index d5656c9ebacc..8ac687bd6ab7 100644
--- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz ->  ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index af3a16f17ad5..2090b6471b99 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -3,5 +3,5 @@ AUX libnids-1.24-libdir.patch 1614 BLAKE2B 7fd082ee26ba798bdc61049c65b7e7a50118c
 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-r6.ebuild 1106 BLAKE2B 6a94bdda1380505cda1129cbafc79431714a425b962b6ac06fca7661c8f036beb01551deef3aebb48c543b2e74d6d0003f28b54c5e532e446bfdce0ed0514635 SHA512 4adc9b043dcd077cab15ad56997900ddf076b51d1f5519c9022838d5417f0885baa43490986cca202e21a94370b71befde01a488451cd06a134ffe3ce987bd7a
-EBUILD libnids-1.24-r7.ebuild 1159 BLAKE2B f5426afc5e125d8a8387ba0efe89269fd109fb1597960ba1755a8a4d4cdc10e7812bb717fa9def3a2cd025365005ea5754cca4813d8fe222b92b0a34d9dd3473 SHA512 dc395fc7a015c0428a2ef847f939294141560759d03359cbf7a96efe74e2a12f8d11be9111b51098486842d412bf6534fba433db78d45928c101754caaa45f9b
+EBUILD libnids-1.24-r7.ebuild 1157 BLAKE2B d85ff2648f8dcada0a038b80b0fb6d590fc8986188d9caa83a059a2fa83327872ae2e36b3bb33be6592ea1a5d7a6d752c4153feec6a1c21121d19333ff83491d SHA512 964d2666d84d2e1a1d591a3080f00bac8db51a1201e42dbc8926d311f23a1d1ae515351fd997c0b8e565f213fd6834ce6f028116767b04e37426fd872cbdd999
 MISC metadata.xml 688 BLAKE2B 1e9f6acc429a683a0aa1b8e14d0f2d9b03cb004c387b0b8582f8056c767af6511ff480f895d715169ceabb4c0722136e624d853819a2ea48f1fe8a6cb77829db SHA512 c70e24c21ba36ff9acff4d4b4290c8087a56e082ca520a7aabf7f0ffca5f03ee49f1bb5ac093304a2cb744241ad749e39022fce7c1a20c28ef08b65da911791a
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild b/net-libs/libnids/libnids-1.24-r7.ebuild
index 2e9dbb9cef34..aec872f32866 100644
--- a/net-libs/libnids/libnids-1.24-r7.ebuild
+++ b/net-libs/libnids/libnids-1.24-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+glib +libnet static-libs"
 
 RDEPEND="
diff --git a/net-libs/libpcapnav/Manifest b/net-libs/libpcapnav/Manifest
index 7e769501692c..5f804a33ec3b 100644
--- a/net-libs/libpcapnav/Manifest
+++ b/net-libs/libpcapnav/Manifest
@@ -1,6 +1,6 @@
 AUX libpcapnav-0.8-includes.patch 395 BLAKE2B 6904addab4a42d233780616364a4603bf691133313614d3f3b36a4b736aa1acbe77d07f0f7751e7069fbadc1e1c87bcf6086b1cde574731dabf0a9a4cfe243d9 SHA512 04570a0f0b5c33565e79922e878171bb98640d2961cc9378c64e17a7144636960fe099bcca4c043d8a4532b98fe7960fdfa24af8145df5c8682af4dcc5d9b99c
 AUX libpcapnav-0.8-noinst_test.patch 609 BLAKE2B 191f9d223334160d8c3d904fe2540f44edbc65f83c263e8f90659ab9b92cc42a7f6addf60914d20bc77d13dda9e9cf500fa2bb03876ec8b9989af8682d22c19c SHA512 f3797711b665d0d094e1c814fcca5c761a51628bf0c807a6caa1a76e6cb06f06b74c741c010e05b84f1f39e61672a886519c81ceb2875101c5e28187633a67fe
 DIST libpcapnav-0.8.tar.gz 387476 BLAKE2B f3027f17307a76fe6baad6fc79ce054726def17c834b814a07c628f8420fe481e661d72e72d7b3dde494ca17b2e36abba3a27d02f68924f88c2a89d57fae8b44 SHA512 bc0357d17228c157de5b480532df37a62459882d5a4fb8d2285fe4e86c1dca301e7cc505f2917bb3421d926bed263d93b2c587311431d9c3a5b02f04c93fdf18
-EBUILD libpcapnav-0.8-r1.ebuild 928 BLAKE2B 86c066397db0ee43b8066edba7358dfa30437cde98131ba0868ec842fdd775899f0e3f226c55862b8416b309e7217fa7832f890efd409ad7c14dae874eb4f3df SHA512 5c7004f0afe4dea863509dc060d2bae387f95b1a7c92f394513d9fb4a054e7e9e9514817e6c56bb0b981b71f96eb9fff3b3b99633b7df54dd6b0e21e4d26834d
+EBUILD libpcapnav-0.8-r1.ebuild 927 BLAKE2B 846f975caa8ce1271a29f9dfa356695be0f06611a84dd8ee529b028174316ae81ee449b11e4b95505fa85dba8951d9da696a6414c14717737de7117fbf7980c2 SHA512 0e4fb9fe4ee1ed22df20ce3e38f5db3015b5ec61bcf0dcc59fe358c655726050ff7a78679fa5fc7f982bcf680eb36b58091813a723b356ffd7722dfb819692d1
 EBUILD libpcapnav-0.8.ebuild 815 BLAKE2B 1b7df5b4e754936e84f01d8850a5b70dc8762a26290bb217ffbb319aab02a8c3d359095879308d723dc840dd16d8c79771528dcb97a0c893888fa2bef095ea12 SHA512 f39d670d58f9d0072a35a600f950323d13523b7291fa57d97f534342987483743d7d05152cbc7baf64fef52cc916b17e5bcb5dbcd891bb7f7e3c0ff3b98068c3
 MISC metadata.xml 357 BLAKE2B ddcf544a7ae28909b7fb7810c0a6bb368099397e2bf7d6e68a2475c5d701d7589aacf0a15f76f00f68b623a7b37c46d60a5faa3c92f1ac73eb2d99fa29b48ccc SHA512 9cf449d26b416d995b8371fe2e6aed6964080b8b84bf0ceace749ceebd4ddbcc8b3d7d9c1d8c2a07a4c7cb880492ffc8b34ad31b4602a646e004f3aaf52f3ae8
diff --git a/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
index a7d6c94bbf77..bfa3f2123330 100644
--- a/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
+++ b/net-libs/libpcapnav/libpcapnav-0.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="net-libs/libpcap"
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 95f989875491..08073a98ba90 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -2,5 +2,5 @@ AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c88632
 DIST libsmi-0.4.8.tar.gz 4104111 BLAKE2B af7fe812d8dd6cbd538fbb9d5671f9478b6c3bf4b251eb0729142f56aacc87fd8aa38927f92ebb4f546069e81391e85be338fec92979cd462efe614e16220754 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
 EBUILD libsmi-0.4.8-r1.ebuild 989 BLAKE2B c0e313ce7f28a9f4bd7154a65ca5a595b8ecb22bd90e4c8e13661813acc257fee594fb737aabed99b1b3cf231e5172177ef4b3e6f487aa8413adcf54f2cadbc8 SHA512 dc7aa0631fb98736d7bc2e9931780584843d4739a1a45aa293ca8c9afddaa2619f46301e127133d48387b787d354fc947368d92e64f25c8d770a936beb60b66e
-EBUILD libsmi-0.5.0-r1.ebuild 905 BLAKE2B 2cd8359a14b69a6573d95a8682e40285e0bd748f111a1b39292681023f33fa0c59599da4e6d9ab91fdba75a38c15809ee4e42a076d13471f96b148b8b4371818 SHA512 9172f6d7ba549fa75cfc241ca7f075f908bb83a9b6b5952efe94bdd0e7ac92f547e76a204d3fe345483fceb9efe204cdb7aefda14b110d76d010109b54e32ebc
+EBUILD libsmi-0.5.0-r1.ebuild 900 BLAKE2B b1103f25ad9d25475945639e4e4ff477c5007f8dcfde01c478bf1e7f6d1b284b8ec80c2eedcb1606a35d33c3123e1475ddff7bd11a9e0001fc1830a48fca2e98 SHA512 bf06c0a21be543837a4c66faf85b584924d6da8fe7698f2c72ee103f6eb10ce6265c6231ad68d4ed7dd649dd640b07aaf968a8df691336bd367016a65645a62d
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
index b7fd8832d139..bb5a6d5723d8 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index c52a67a0d64c..ad7b2ee19654 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -5,5 +5,5 @@ DIST libwebsockets-4.0.20.tar.gz 12342036 BLAKE2B 983190f7f63eb9db09b688ae056c6f
 DIST libwebsockets-4.1.4.tar.gz 12698800 BLAKE2B 78cb9587af7a5cc368c3c4ce7b8c8cba7d25961595ae8853f52d374b73404e5fbd99ff9b552dc9d6370fd425d6bd28fc69b71be37f2f045817f2cb8f5354dcbc SHA512 4da84f612ad427465c4eea0bdd0db59c21c9e42bb21eb46b904f544dc4078af2c9a957e61430f3569b87cfc96b3addee50ac7a7c77777dcf16350fe441dd8854
 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
 EBUILD libwebsockets-4.0.20.ebuild 2519 BLAKE2B 88c178b4a7ab0704bdb0660274d59488ed14d7e365c92a991f90963789cb4ea6409f3774e710617ae254f3e1a525d255dc66d21b8c30200bf714fe67be422b4d SHA512 d1ec85cf9704f300ec40186226960fde1474a7654b93665025a4b8ee37b17147d95ff7179e276763b3d23f83b6eab7cfbe52c532475023ec8a5af2e838632f91
-EBUILD libwebsockets-4.1.4.ebuild 2368 BLAKE2B 978ddf6ddc319cc93fcc5a22be81475e5dc329d8ea78f103b7a739bab55fab92522205be1da6783cb5142f650b79d7a099ebdcf52345e4960293afe56ca62138 SHA512 48e48e32e3f971dbab4d896121e180c87457b2e41cf483b130eb0b09e699655875d75d38bf42b25f5b085dc3fd702395c2dfb2fa5c49e505a2fa1e14f1718344
+EBUILD libwebsockets-4.1.4.ebuild 2366 BLAKE2B 72f10892bd09819e875043d39ac622e49e256b5ff1cdcd9282a9af08f8b77e615ee5e2aa63050f77757176fc663ff77b28775f1c00608998df265c9bc190ef89 SHA512 8d351ed9166344d4ddd23ce4270709311aae4aaba14bf4a96a3b04a95d4198110abb74b58b973fb8856297860a9c782a417233fd5315e9f4a7cde89cf56e3fbc
 MISC metadata.xml 1662 BLAKE2B ba4299d39ac10860ea908bf83ccf687af48d3e5764b9823a9d1e727390dc53c569d1e824587fb7e586e211e4366c799b1e91efb817fe6495ed0e6ea643e94147 SHA512 722b59c06d1d1810b21852cac65fd6a7a929f280cbdcdfd0ea97285e8bcbf17ad84d00c7d41308deb2d91905ce3d5f3f0cdc8f5f975a4eb7c0b7fefa431becfe
diff --git a/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
index 30dbd55c5f2f..6c9e16a747a4 100644
--- a/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/17" # libwebsockets.so.17
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl static-libs threads zip"
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 64b2c89d9e9a..7cf083006144 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,6 +1,6 @@
 DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
 DIST nghttp2-1.42.0.tar.xz 3973284 BLAKE2B 39431619bd3c9a66eb217065bb29ceba8f3fda376343687b4774ed5e73c634f51142b407f9515ae5ad4363af5cf57c0199f9bfddf5bc08dc587419ec03cf5b45 SHA512 1d93e6262c5538e26fbf36567230b4a239dbdfee26198b1e1d5862bf4459ae435679674c047407f5c604ddff91d7717d8515532e00bcdb2aa75f27ff97dce60c
 EBUILD nghttp2-1.41.0.ebuild 2009 BLAKE2B 4a7a37c6b445be8f5e84a5fba2a5982c33037ad04de4cca1bdd869d600f7416945277510803ad9fe657edf94bf6fee914d75ab4a5bcaa92dfcc223ac36a7ba32 SHA512 5e5dfb11026419e9dfa6101dbd5617ac77dbd3c2fd1877bbf73bf8a88b545aa29c7dbdd7551d54fdb2b07d0ea0d6c6342f0ec67be096f3fbb2766548c4aa3d94
-EBUILD nghttp2-1.42.0.ebuild 1987 BLAKE2B 3e5897f4756138350cadc5e72bb25b394a701ffc7ef93334231a225bb4d66b3b289982eb2218310e73c989de2193cb1c8cca73cdeb44bd1efaf8cccc927edbcb SHA512 d91a22ec19c033867f8df446da7e9d51d0bc461303b55a0c937071e2a08c54a0a33f9a5c80a9a454ea355b8e39432a2756a49801482caa5b41d6639008e4b428
+EBUILD nghttp2-1.42.0.ebuild 1998 BLAKE2B d5db11f1afac81618eae5d83c81bff6d9d4e2fb9006cdb6d5abd17caefbf18b6c025437ebb17dac40568fbe3b63ea5189622dbae25d0fc1331c6338c4c3b4575 SHA512 4ba3fb08741e219b646afda506ebe958248cdbddb3c7b3878182e3961078882ae8d6e231172ff3c0809c7932331aaff2d147b4195a976fae26ea9f8c1065c2fc
 EBUILD nghttp2-9999.ebuild 1987 BLAKE2B 3e5897f4756138350cadc5e72bb25b394a701ffc7ef93334231a225bb4d66b3b289982eb2218310e73c989de2193cb1c8cca73cdeb44bd1efaf8cccc927edbcb SHA512 d91a22ec19c033867f8df446da7e9d51d0bc461303b55a0c937071e2a08c54a0a33f9a5c80a9a454ea355b8e39432a2756a49801482caa5b41d6639008e4b428
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.42.0.ebuild b/net-libs/nghttp2/nghttp2-1.42.0.ebuild
index b43a0d325068..ee4707056e7a 100644
--- a/net-libs/nghttp2/nghttp2-1.42.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.42.0.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 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 9fdbd30e0cc1..7184ab1b32c3 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
index 94f5ed3a2e60..30f11e2710d1 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -1,5 +1,5 @@
 DIST fdm-1.9.tar.gz 299916 BLAKE2B 0c9bb9514a4d36fb1168be73fe745aa136cea75e0ebde28ab181be7d4b7e093c0bec775222e8a333e14baa90871739fa095a89bf8d1f16a86dee03b6d01021aa SHA512 e7e5c8aae8be3e82ff6015d2d87fd9d0dad4fe24796b4f30d6874f761e2df6900c8940d39de28bb2db6ee3ea3faf494c57149037657d986a3b54db3a6a601ca7
 DIST fdm-2.0.tar.gz 313596 BLAKE2B 8b323f4a8953a46773a4e5a1214444dc97db4346f50990fcfb4c9d79ae40bbb73b61e3bf41bc95b76e44f6bed7b398cb210d58901823752e92ca7b83189cbc7e SHA512 14e923202d17083ceb3b91b3a442d7e512c37f3d29535f22d8c0c4e1d57c97acc5d5465d643ed0cf437b3945ef777a6e38da3117219c2d54dcec88ecab1e10d9
 EBUILD fdm-1.9.ebuild 920 BLAKE2B 70d8d1f0438dda55671ddba7b17b868d63f89c573d5a8ceb0cf00f8d04253358089b05d29ff7eb7d2e27b431f0c413b007657ef2c2c642d9da829909a761c63a SHA512 d6cb2804a8df302ddc87c3ab84a7f0154d6eee144ebba10ce72a7a427aeebc487132dee472f8496270bf5b13623b66e3dc4a9fd7059817f9549851b2033c15b4
-EBUILD fdm-2.0.ebuild 842 BLAKE2B 53fbab79656bed53fc503d9d23f32fcc6effd5ab536c1066b79441e5b51169ad2ea58fdcb2872d19d1e9ed525091516c2b5983154a090e9798b44422ded5d770 SHA512 e8cb0f3eac3cb420945ee6243704c783c381e8bdf220e7e2b9f164ca055507960e3472d5a2eaf855635106363e6c5a93791383175e1264b1ca339d8513f36e2a
+EBUILD fdm-2.0.ebuild 841 BLAKE2B 90dae6ba8dcfa5a2f9552fd90ce1b94f0816f743a2290afe00381554e34f4dd1c53d1ea5927e9699a82c3fb73751cdf8a83bcad20e28f2675f9b84abfd554921 SHA512 3f94f2ac469eb96c0d14b2568adb5a121aeed43c93bc2ba620803e167a533376cc5d05465e3cab54227f5f39a2d1d40739febe061e0843cb9a2ea4a180c4aa1f
 MISC metadata.xml 395 BLAKE2B d62bae2c039a663b01a2ddaa4a025766c05032c2484eb0638dcf2dff888464fd7e582449a0ae1f53da2e2eced93bda7772e68c89e192bec17b9332ebe3878666 SHA512 08b8b693f7b5750b721c81181cbebc031bcd50fbf2b45706e2e78597f35c567267fa4e924d97f1df9969603d2be74a7e269769d957c1ac121dae772021b00bfe
diff --git a/net-mail/fdm/fdm-2.0.ebuild b/net-mail/fdm/fdm-2.0.ebuild
index 90719cb03337..c74527c128e3 100644
--- a/net-mail/fdm/fdm-2.0.ebuild
+++ b/net-mail/fdm/fdm-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples libressl pcre"
 
 DEPEND="!libressl? ( dev-libs/openssl:0= )
diff --git a/net-mail/swaks/Manifest b/net-mail/swaks/Manifest
index 7d0de17efcf0..56012b0fba92 100644
--- a/net-mail/swaks/Manifest
+++ b/net-mail/swaks/Manifest
@@ -1,8 +1,6 @@
 AUX swaks-perl-5.18.patch 2139 BLAKE2B 03501cda36503a966a1d1d50b94b054d2aaa1584566a64a7e393e4d81fd0f8e456734e0b787723e7aec5caa55b08ab264da897b7bb8ead351250c7402e73e361 SHA512 f5d507e2b2812776f4a35e66a3ace3a9edb3d3c50fc7734304d48a278aa7c3fe725f363d14c61442d11a07e8266bab8ce486c4c9eaae2c5ec7e93484c5ffcb53
-DIST swaks-20130209.0.tar.gz 102227 BLAKE2B 4726da81869e137458f1a3776c51ae33215999bef56b1835cf8558166bd756a8186900b83c0bf32a81d1ab1cf23ec379061f4db78ae5efa51de7a6c1a69d0092 SHA512 bf3c639f2c227d8219d5bc98a3d3519886471168c16e38d036283eeb1bb786c80bb80a648637150b3eb1903ef0c0d01bc37fd7b4f55af66a20f7bef18067b118
 DIST swaks-20190914.0.tar.gz 120803 BLAKE2B 68731c22fbff5ece5c9589c3767afd6aa4fc781df8c6124a0f57d48a3dff8def31ccae1b043e78f7c066194cfe480a0edeb16e43fcd5e1b1aa75b05e65a2367e SHA512 3167435a73e7729d090cba2431d5828895c25154c36d92e0ebecd5c4e2430ca596d62bb3e6eb3b65eadabd52c8331fe3bb8a492cce3ad247fa113c0af9c67339
 DIST swaks-20201014.0.tar.gz 110953 BLAKE2B 8dd2c681c6c1e66b76bda71f0bc8b88e658565b28c29ae9f02e5c27500619598e5817a442aa82c48fd90be80cd2dc54eda8390ad3d1cb2e00163cc07a526f463 SHA512 8a4e8dc810a9c5943afdbc4db7130e110c42e211d6927ce1cdbab6f81fa49c31490e6c3668ec3cea79580c07b281ce30901b3b4a71325951167158cc9d70d9cc
-EBUILD swaks-20130209.0-r1.ebuild 973 BLAKE2B 916ee1b50772d67a8453a5745a78da399c7868a11bf33fd9fffbc00295419950d45078e4fc5e3b66d439d32d7289059c40d367b12ac846404931587e212f5c81 SHA512 071d817f0d8b8e60be7c0c012baffbbfd99a1ff717351a750bca7e7fe539c886290c164965f2632f441181f84ca40990ef728fa4d7f08f7abdb25cce2ff62378
 EBUILD swaks-20190914.0.ebuild 893 BLAKE2B 40594f87773d93f89871ab6b23342877e8e5dcf53b497a024499e8222315c2b5cf55b63de7e6e2549a7369ff9df694057f33f34a2a1e99f2c33699c587118dde SHA512 8836c89d2cfb902ce75ebd9d95681b73729e43ed83eb9763227a0f082430383b8d265e346943c341558669b1741d3f7964a11aa056221ec1e93cd612ec04d540
 EBUILD swaks-20201014.0.ebuild 1093 BLAKE2B 6cab8f15bd25d724724dc17995402054fc339828506904ddfb530ffb28d133c40fddc8cc0cbc03f01fab81267338a299da4ee1e76685246f505a5d2c5455a749 SHA512 4b3f55db68d265f035ade639e91714ffc43a11f9a9a7c120fb7cba6088fe5730f3c7a9fd024d536e023234c791c741b611a7d4aa8380c13a2d77e83977d6409a
 MISC metadata.xml 540 BLAKE2B a3271dc0ad82899ef2945c3d42eb2030f08f47d7ae8633d89fe03edfe6b26f36eee4c7da193730360a7e54fae8d1c853cd24012024f33a96debe34330877737e SHA512 a0275812c2941b91adb18befe36ffe5e87a2d4dad904b3c7988e88f0b9252105d4bd35a18259c0c777a5f533632e1d2bbeb28298b0c97e69ddcc902e4919167c
diff --git a/net-mail/swaks/swaks-20130209.0-r1.ebuild b/net-mail/swaks/swaks-20130209.0-r1.ebuild
deleted file mode 100644
index 069127b07c96..000000000000
--- a/net-mail/swaks/swaks-20130209.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH"
-HOMEPAGE="http://www.jetmore.org/john/code/swaks"
-SRC_URI="http://www.jetmore.org/john/code/swaks/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="ssl"
-
-DEPEND=">=dev-lang/perl-5.8.8"
-
-RDEPEND="${DEPEND}
-		>=dev-perl/Net-DNS-0.65
-		ssl? ( >=dev-perl/Net-SSLeay-1.35 )
-		>=virtual/perl-MIME-Base64-3.07
-		>=virtual/perl-Digest-MD5-2.39
-		>=virtual/perl-Time-HiRes-1.97
-		>=virtual/perl-Time-Local-1.19
-		>=dev-perl/Authen-NTLM-1.02
-		>=dev-perl/Authen-DigestMD5-0.04
-		virtual/perl-Digest-SHA"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-perl-5.18.patch
-}
-
-src_compile() {
-	/usr/bin/pod2man -s 1 doc/ref.pod swaks.1 || die "man page compulation failed"
-}
-
-src_install() {
-	newbin swaks swaks
-	doman swaks.1
-	dodoc README doc/*.txt
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e4fe34ef6842..651c1c5407b1 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 2ac1313f9700..2c855fa0cb49 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -3,10 +3,10 @@ AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8
 AUX dhcpcd.service 308 BLAKE2B b9533183aedeb8243512923de5eab61b8655bbd907d89cd06d1fac13c4b1a7741b59e9eebd37abfcfd2092781ba29e43edd4fa09d4eefc5b54c62ea74aa3885e SHA512 ff512117941a285e0b6f90689a78d6149d134d457ab08be78cd741f2c3707eb0c21ddf5961d8d5972844a13e995bb1757a29b9d0e6b26c6761250c8f9da29557
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
 DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96 SHA512 40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a
-DIST dhcpcd-9.3.2.tar.xz 254476 BLAKE2B 86cbb02564474e8ec6809315db10ec06c072ab3e4a563b2a0f1df21d1c02ed3a97b816ed190803910f0cfe39de6420b82cc37ff81e29b67806b250c877b0db34 SHA512 f7e5b060e8b5cd65e6d1660a79d444e066dd8a6c492cc44b9522577687a93d944227ad3ff840ac0f65a9aa725ca1a79a7178330d8445b808409e215ba7f042b0
 DIST dhcpcd-9.3.3.tar.xz 254972 BLAKE2B 6f808d08059ca93fd2af14b9b6efbcece08634a72c8f06bb31a49ee5c6a7f52af6bfeb43e007710b466bd70d4005416d7882fc93ac5b28e1a019f06b9b0afe15 SHA512 1ff58107fe7e45a42c8da32ce6554244c1cac289e0c207f7dd29f5fcab1a2aadd66434604cd35e979e0aa138de9d968e9360b5339d3f233e6c1a83d7a20799c4
+DIST dhcpcd-9.3.4.tar.xz 255212 BLAKE2B cd64dca55bd8adfcfa8ffb5f75a949c6f8aef9f1bf7925060590f7f5f0325e08de3c766c8ff780736eb2bed40ba3ae7b59c3cf3e03f2ad1bd7ff4c92aafb6370 SHA512 00125cbed9a20ba016cbb383c02ce61a58482dcf6c46144e573ee3759dbaf19b5f470eaf19038197d0ff4249c852773c537294bab30b5bf3f5bae4d754741517
 EBUILD dhcpcd-8.1.9.ebuild 4385 BLAKE2B 858612ce43483bb8a1c04f6dd81847ffe8519dcfba2fdaddc6bbb6e370a3734ac8349bdc12af2f1594779280c28e20c390ca25a97a28df6dbdee45aebbfa7fe7 SHA512 f69f3beea8ec74c02b2ea5d9a3653c9d7edf8e947721b243ff8c5df54e68aa352346080fc1f6db36eae8b851c93eefc978d6345153c0b96ffc4cada0bf685021
-EBUILD dhcpcd-9.3.2.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 EBUILD dhcpcd-9.3.3.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
+EBUILD dhcpcd-9.3.4.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 EBUILD dhcpcd-9999.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 MISC metadata.xml 646 BLAKE2B 80de0aeee2dbf33f6bebf9a64be5b13a8eb078e7693157ede4e31bc2ab86b9588b40949af7c9dc511e679202640a7c053689a5c562dadcedf9216d9dce25b1e6 SHA512 5917c153c5fa048bdca17cbcd0b5ce81a152635de166fa140ced7e46bffacc9e2335092d8c4454fd33515a8d28cb8b1f114dcef8465526837477a90dd20e980d
diff --git a/net-misc/dhcpcd/dhcpcd-9.3.2.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
similarity index 100%
rename from net-misc/dhcpcd/dhcpcd-9.3.2.ebuild
rename to net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest
index 4e64bc2c9920..2f7da745d4ac 100644
--- a/net-misc/ipcalc/Manifest
+++ b/net-misc/ipcalc/Manifest
@@ -2,5 +2,5 @@ DIST ipcalc-0.41.tar.gz 21599 BLAKE2B 3b54df9bb38fa42c9b11d1192a8e23e6cd7c9cdadc
 DIST ipcalc_0.42-2.debian.tar.xz 6144 BLAKE2B 7fa1e32f9c713b4f3dfa8636f9bb4b0bd70e09e3d02e71f1f2186e8e2ab381638eb33e63c24f41dfa948db11b7e877a147d22363d105ac26e98ff509d1cd0aa2 SHA512 6b7049bc5e27e22dbbca12913716757cb3f5b91d0a8f729d35a67971c763b0bea8ab65c24fe31ad43755aedb68650c1d8b3f3e770228ed6517b43e83735086ec
 DIST ipcalc_0.42.orig.tar.gz 25903 BLAKE2B 5abff0f234829ef84345645634f1b12287456c26a42cb65856f26ac12699d5f100a2ef432a6d19627f72d800e65257d46bc0edd8ec1bf4054dcdf843d2ee158f SHA512 4e67ccdbb7e42ced39ee8ac83e47585d400c1b0a26e74a909c2e29e7f2256e37b06855cc29f0272b71c5ff6bdd8252e2563ad89562cd8d04ce0fa032f6f3fb34
 EBUILD ipcalc-0.41.ebuild 527 BLAKE2B 667a37107ed4f346d4a4f7b9f9c2b909a38dd90855ed336ffe7766668bba206229a856c2aba26f6edb36e474ecb00a509fc04185f238d72cdb788d6d5f0c75f4 SHA512 10133935b6510c91944acd7ff5b43e5dfce8eda29fc7ebd46aad529537da2d2d9414ddacb0b86d7451e9bfebbc8b8eeb577dbfe7a8631d79e3cc07a7f97101d2
-EBUILD ipcalc-0.42_p2.ebuild 760 BLAKE2B 41ea2eced52303ff39d7d3414805ac3a44ba1a5047f16eb6960b7094e8f879cc71df12983702ddb0c8080e724293f13bad52c2095a393fb8cd75cb50ce906161 SHA512 bea4f5a4f01b9ce31bd42f8e5035e39cf7a0a48b7545cd3c9fdb4c00b4a5905af7d7c65c64fe96a66e4a996448a984eac9a48346941808fc9ee3549f2ae9d8d1
+EBUILD ipcalc-0.42_p2.ebuild 755 BLAKE2B 2a354d1126461382cf8b272916421bb42bf512d9ac4e17e0ca5c35400cf9b83eb893133c098f527bbf21ae33a84e1b66f1cf22241352585b387b193eb476bca1 SHA512 8e04f5d9a221130445eec2076f29d76bfe891fe3a2fb4329e79805c6573074dd092bdcf49f93085e66c780c68e4a5d98db593fb0d9a1f3abc0f68823cb30cdc8
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
index bac7f1cb48fb..6cfc31ac5bea 100644
--- a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
 "
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 
 RDEPEND=">=dev-lang/perl-5.6.0"
diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
index 395837962ce2..75200bf2d171 100644
--- a/net-misc/ipmiview/Manifest
+++ b/net-misc/ipmiview/Manifest
@@ -1,5 +1,5 @@
 AUX fake-java-r1.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e7244b4953764da3f4a2bc4ffb7118bbe8bcc9c6d8cf9c5e42a1990219ca7e8d89cb931f5ee6265d214 SHA512 9de74481bcff69098484b328157ad2208255e791dd4595e1ba926a2754c7bbae04b94ec4d717e7b9556b64bf4fdc749e012c99fdc771844fbf003021d9cda65a
 AUX launcher-pre.bash 143 BLAKE2B b33051ba8052380465c59b68733416298166949bcc794047a097816dac68fed0bc7ad39dc056e57e5114f622faf64b67598028b35b83d6ded95034d2a71126d0 SHA512 2a1b35175fe6364eb7790de93878d4834ca69f1dde438fdcf0cebd7c7bf16600f2eaacf334f91c740512ad068914c1adb7a09017a23694bcceb837be20989161
-DIST IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz 105509705 BLAKE2B 915c1c27bb9e1f519634c0c2a78e3673aaa2c6e713be1132d2682dabf8f56a35b16c2403645fc0fda54643e35214ead65ef9d01854180219dfcc8489904b8766 SHA512 17ed72e802fb0a55c140f98262575385ede2d490484fe926bb7ff19f34e5a376f2d21025e99318d2001b042487729dc8b07b38cca4bf62df6e04d7df0d1d3091
-EBUILD ipmiview-2.17.0.200505.ebuild 2050 BLAKE2B f7e27ae0b780324bdc6b07e065739eaad96807daecc3c296f42c21a22684233def5954dfad4d79062c48ceedc205f64ccd057f0c115e1108637fb4f04b49e00a SHA512 dad201c2af7ed264b5ef8a504720173d146dfffdb3b91db9520130a45b4fa901e84a895c0cd4939c3959cee8f9250cb32906cbf383d2c1acbbd22caaa09cf750
+DIST IPMIView_2.18.0_build.201007_bundleJRE_Linux_x64.tar.gz 108315796 BLAKE2B 5ffbe555245a6fce04bd53ad7f91f8a7aef3b645b0f9affa0aaa7fbaa221cc7259d0de2ee7bf9a3d6e79f5525190314435c4553c785c1b345030edd7b46126d8 SHA512 bda6116f59776b93c449711ad890160238b53ec93aabc669b2c5938eaee7f594e3b91a11f8c293110874fb13c2ed94692257c16fbffe7f86c1d2ee757d30b948
+EBUILD ipmiview-2.18.0.201007.ebuild 2050 BLAKE2B f7e27ae0b780324bdc6b07e065739eaad96807daecc3c296f42c21a22684233def5954dfad4d79062c48ceedc205f64ccd057f0c115e1108637fb4f04b49e00a SHA512 dad201c2af7ed264b5ef8a504720173d146dfffdb3b91db9520130a45b4fa901e84a895c0cd4939c3959cee8f9250cb32906cbf383d2c1acbbd22caaa09cf750
 MISC metadata.xml 702 BLAKE2B 094fd116b6c0d306d68106f78b867450fdb4a48b321a69f2169dac1737b6f8b93df2740e4f04b0671b61e01d872542411a22773f043ffefa8adbeb64cfc43ce3 SHA512 ee1eb3a7497345d7f7d8c55d25dd6d8f2b0353e1d785ee496cde69c2a1b386ebc96aaf70d5a70eee8d6294b5b072dfe97882254d3f42d4f69d238dde78aec6ce
diff --git a/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild b/net-misc/ipmiview/ipmiview-2.18.0.201007.ebuild
similarity index 100%
rename from net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
rename to net-misc/ipmiview/ipmiview-2.18.0.201007.ebuild
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index b06a6906d81c..67dec4440365 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,5 +1,5 @@
 DIST keychain-2.8.1.tar.gz 43866 BLAKE2B 7b861d9ded273341da47ee8db77b5b665a81cbb82e6ea9b434c0901f2310161fdc504ba9ed728c942c93b21069954e0ab87319f949cd96fb135c2e4991b8cefa SHA512 d04868f66e3dd3f75a550a261b3ee0dcc1e2f1dfa058f673305bc60c20eda867099d6ae53f4e92be521a66c630ca3e585bc1a19f58eaadad1441ad5ebe27f926
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
 EBUILD keychain-2.8.1.ebuild 658 BLAKE2B cb87e182b942a54e13f39f673f72af5d025a6730eef80cc727e1d28dc1618c73bded8c51ab93ead81b2194b41cfbedd11f3676406333f4053ac9519f7d9d38c1 SHA512 817595d5e64edb26378fc3319050f655169c2bfbdb40df6d7faf9177d0e15b84068f6ec131f4dbbd3359633e7e16bd100889b79f23422ec5035f5d3233ab896f
-EBUILD keychain-2.8.5.ebuild 657 BLAKE2B 2d137854bae6eb59fefc55da476013dc164a2dd66f99284932d784cf099e141155773b16069a55f19218f12d837c31936dd2c0023e50a4d31ad3aac855ac767e SHA512 d3106e36aa8195fc7abbc7fb93f649923ab933a2ce4816b2c445d27a2fdee0edc902af92a621abb5d71532a397775da39e2764a54e6b0c16b3284761358bf080
+EBUILD keychain-2.8.5.ebuild 655 BLAKE2B 0e495a1aac5b5f30e445e475915b0dddb01e9bde809e72917192963f173c10d733eabc92efd31d8d8b36dbe68d91a28494f7fff800a4f3e8f194a4bf2ae3dd6e SHA512 e87863bac3464d9e069829211cf9a23428a69c4ff70269bd9adc5e10a6d1c19749e704d2d853d9c78bf11ca5fe6a2006f42e0570b4d277cdc04d45aad6c78644
 MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild
index 4de9af19d8cf..a33bf131577b 100644
--- a/net-misc/keychain/keychain-2.8.5.ebuild
+++ b/net-misc/keychain/keychain-2.8.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest
index 40f1e4324a6b..0671b1d164e5 100644
--- a/net-misc/libteam/Manifest
+++ b/net-misc/libteam/Manifest
@@ -1,6 +1,6 @@
 DIST libteam-1.22.tar.gz 544302 BLAKE2B 8c20471506546de6f45989513ed22fe79f694febacbf1a0caeda872e6e8b815f9813cff682eb11060c3bb1b2ef12149f34d15c201a6b50fe438bf9776abda987 SHA512 7f54b7e87c1d3a5150e598052126e1c2f5396096450a68a923c9cfb7bcc48b724cddc61f55e34d1b5df103f5473367eb268877100f10c58d53fc3eaf24749d5b
 DIST libteam-1.31.tar.gz 176331 BLAKE2B 77aae059b37a018e5503642138aa469f0769d305ec2043642fb1d84ff1d05f6eb90083946ca113cf3f9c21a09a17b3fbda327b714eb96743a10e99b89d5d5c83 SHA512 1382cc3b0a2d0211f33e506e8a6fd8a1847398fa5bba56abfc959da70bcc8417cf1dba9e26a777da5729eb237f51a66b3f9cfa33fb830ed684aa076f4c8cec9e
 EBUILD libteam-1.22.ebuild 1278 BLAKE2B 760afca7072e722f981b8a492accd81ca33907389f601a6baa8b74c025c8011c69d5f2ad67d7db1682a6cc9f52edc6158d79743df2090bdd972c2563198e3420 SHA512 b041b9a44a39c69947febd1747d238cc38ebddd4ca55e2032523875d388edbf0d41744d9dab2b6c3a78d76e6c3d286e28ed98fcc325889f770f147224e0f676a
-EBUILD libteam-1.31.ebuild 1373 BLAKE2B 36c7791e28110fce03efb8e4f812c42ef8ce56d10556e27d2d4b4f1546568f4684415146ed0fee2b5c42600e5835d2b0babe1669924bb3c6e06a2985a0e26007 SHA512 eee04cd5ee120125476697b1f6e8eb1ca29f17366d2853c729e19337d1f3e78c239b2f5fb91ffa92343e8158936d710979645051361daa3b02ed006ec222009d
+EBUILD libteam-1.31.ebuild 1370 BLAKE2B 8f8f109b30bfbaafb5a7b0b6119d1ea9c42288ca3b05346f15d93cd117845f641d0d01e23ef764b01e6b26eeb1f38e185c8b55e1241e2cf3b3f4094c65e530e8 SHA512 3a7f68c7e6434c337e385acca223b28321b18708404008aab11897513304f023cdd9c71d3ad98ab73c446bdcd4b0b7b2e6a3be8554c85949cd551036c0756b0b
 EBUILD libteam-9999.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653
 MISC metadata.xml 334 BLAKE2B c4d7a143b2617bc5896b42db67b45115231eef0177c1bd6d4878fcce85b1db00085153aff0a51b7e4b877b2bc68aeeb7769f8360042a6e6e21d5c9371bcc2e03 SHA512 0cdfae73365dfd53d676ae7ab8e9a0689f0a117542d5fb99e1c5987ae41388f8f8c54b37829915035f417b7e9ac30b6f2abccf95b8a3202c7a6731530201d2d4
diff --git a/net-misc/libteam/libteam-1.31.ebuild b/net-misc/libteam/libteam-1.31.ebuild
index 48dbecbb6983..9d1256a90821 100644
--- a/net-misc/libteam/libteam-1.31.ebuild
+++ b/net-misc/libteam/libteam-1.31.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Library and tools set for controlling team network device"
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 8518c28b1916..259808cb4cc7 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -7,5 +7,5 @@ DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a396
 DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
 EBUILD minidlna-1.2.1-r1.ebuild 2785 BLAKE2B 313911fc6b289e4912d7d431ff14ed26ccc657d298241df4229c6fb462ea7aa848e72bbfcdfaf1bd2a7c20e5617c8b6f07476c5535f65796bae430a32170b7e9 SHA512 ae59f442bac0748275b767239be6ccc216ce33bfdde623b3daadb09dce08a7825f9ad1747195cd21ae8b44c205398c2d968f7ee3074a0275f7abda3f95aa3347
-EBUILD minidlna-1.3.0.ebuild 2097 BLAKE2B 8bdbc49aeb8bbd801be2adf10aae8caaa241a92deeb11df7d5f15b487da65c2d468709da25fa1c829904b39b6ade89cf1a5e9d5457b0143f65c485640d2b6217 SHA512 ba4c753e0d968c230a57c7adad978c792db51e81a1e08e985e31c91f136ce8f7099568d0ff1cf871d08c285f5de0de115425db8d0e9a1b6a2ef7688fbbbdded0
+EBUILD minidlna-1.3.0.ebuild 2095 BLAKE2B b7ecd152523b43cb0be7f7a7649c6334f9e960116782195a282cd7a9ca8edfe9f6673f4ce07f0112253f4ba485c56e94f39e1d6ba636b5a80c25626d74631fb7 SHA512 da253842e68f63d683c2ab940ef1f415ca1cc877ae0334cc87bc009dbef7475f6052ad1ac2473711fb2ac90b70164cfab107ee7f9e0036d8c6a80d7197c4c1e7
 MISC metadata.xml 512 BLAKE2B 4f4f646b79a65b8563381b6534b8cc51d3731f529b3eb2352ed19032123a9e3801c23fde576dab0467e04f9eef4ffa8bf89171ed3929fc808c9a4b08122bfaad SHA512 571087e06e7d8d32ea6923043738b5f36eadd60880a49260ada78416bb8b2c56a3756408bea161d0292ccfa92acad6322a1f5c960afd0930fc2187f941d9dfc4
diff --git a/net-misc/minidlna/minidlna-1.3.0.ebuild b/net-misc/minidlna/minidlna-1.3.0.ebuild
index 518b2f03944e..ead293b1b92c 100644
--- a/net-misc/minidlna/minidlna-1.3.0.ebuild
+++ b/net-misc/minidlna/minidlna-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="elibc_musl netgear readynas zeroconf"
 
 RDEPEND="
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index a803df4a5ae6..8f2c3778c210 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -3,7 +3,7 @@ AUX netifrc-0.7.1-dhcpcd_pidfile_location.patch 1580 BLAKE2B c1fa6aeedf5964b41a0
 DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0351cc210ea0134e654cd44f90cba0390014412f6b45ff4d337d3aaeb5e739553231305846351452aebac870e1 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710
 DIST netifrc-0.7.1.tar.gz 82393 BLAKE2B a1d147db2a4e4ff7d360bf5140ccf060283dbcbfde7100f1d193c783f1da540574e1342b4d7f3f9ee011628f9f113fc751416805f35678a1093e0cc0014f5eb9 SHA512 407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057
 EBUILD netifrc-0.5.1.ebuild 2101 BLAKE2B fa748e43c948521df151189006cb9a45db49e1904074dcf71941aeb98aa878155dc5a0a341800c6bb27155caf4342b3fefe9a18edecd9b397244e7b293a5842a SHA512 bf1e0d20256138853b3508f2c88c67c33c14301325492542c3c7497d343c02b2a8ae0095bb0d0e4c0e33199b350429147349f231bdc2d1f1a3ad106e5fbf6a7e
-EBUILD netifrc-0.7.1-r1.ebuild 2170 BLAKE2B b22bfbaf233e1a0d3661b13a9ded17f5ff8e3eb1090ad4f40c652f64657d46ac512a5ce5790a5b2efa0c102f2e0adfce7ac7cdc3fe142b9c36e04b0d9aa39692 SHA512 ea41b89123dec35c40836ef56768357dfaf0274a786db66c594b4774a2edb85694da8c95e7396777c39e2d60d825e64e24b64494823876b8588282d1f531f670
+EBUILD netifrc-0.7.1-r1.ebuild 2165 BLAKE2B e5d9b5792051c9527e326f3d383ee1156242bfccf6eec652c25884f1a789bc18f822a00e24a6bff202feb3385130b0c8094a6b26b8cd70bb6e2433b460ae6d3c SHA512 d06897f168b84e3bc9d318f3e87d0b2c3e7882529621693cf0fef25127bc4b7e204e882cbc3227c1884ff303d911a44cd650eff00e09f8d6cec5155837030f86
 EBUILD netifrc-0.7.1.ebuild 2099 BLAKE2B a8469f41f1feb23313425d4f4224fe4c93a73d226667bfb2965940491b71bb9d7272a0feaf76eaf820a56b4e69c2d2975833d55aa715e5f8e9365e38c641d4d0 SHA512 4d344118f4d6878a3e6b2461ce013457b211103248b8d8945e76559300e29544012c28d087a0f2f855a8f6bff960b9cc1b99fd0216d945e228770c2c7b6196ba
 EBUILD netifrc-9999.ebuild 2047 BLAKE2B decbe78b5ac86f957ee27f203b0af14d8e4e022bc326891b5f990849c5817e9fec3a07ad0409fd3619b07a3a3683fbf6c9aef8f0c39f378a7e7276a7a5c6e80a SHA512 0b3d9ea722a45d91a9edc38616ee239910df1c8bf8c5ada1e75f78842c07e89756da519e46132cabd18b705b51c52a3dabfa3ed8ef196e156e34364ec8733a23
 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5
diff --git a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
index 4fc9c170622c..16953a946589 100644
--- a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	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"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 19edd1e47175..08acdfe856f1 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -4,5 +4,5 @@ DIST ofono-1.30.tar.xz 1030428 BLAKE2B 94248b7eb7b48000333fdee38eaecf13c259adf2c
 DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20
 EBUILD ofono-1.16.ebuild 1624 BLAKE2B 1948438d3150f5cdc848ce72c10fcd70105d1854bec2f0e941d5eb24aaf869826e6e7de8b7b46c92d4f9a5a56a537baacaecce29d406abf1302964b4ab46a2e7 SHA512 fafe6075e7c1abb6b513c0a09620c61ce8e1472b6972d69ec23bfc652b7b63d2e983affe67bad31a5160e885e40576d3c67230e4f67ab0c989714ece954457bd
 EBUILD ofono-1.30.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
-EBUILD ofono-1.31.ebuild 1641 BLAKE2B 9fc5e13784d35b164610244212e2e6db2c83be8d97ec0cad2c9f81fb3d1f017231139c1b8e938f6d94f2ce9fc1de6bded261eff9723cec3cb911b1e3702b4894 SHA512 4a78a5d43969746fb4f577b7ab42d67b14c88294dbe8eda7cad9d744bb1ecf756ac91059443868f7e7842741d4dd591293c42db0d88e9cadc6ed6ba25647f878
+EBUILD ofono-1.31.ebuild 1637 BLAKE2B 8bf01a379c38748a958fb34e385e81b61935c416aa360a7401fe21c4048693c86eb617f9113a46fbb525e5ac4ab44873f66b50c77bfc74cd84221dd82fe099a9 SHA512 c4a36ff45fd2cb2e4fb7d18f21a0d954e074e792f7ff3eab25f1407af9ca3337c7266a4fb949a651112002096cc2023c8fdea3b559d6d8197638924dc41b1476
 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e
diff --git a/net-misc/ofono/ofono-1.31.ebuild b/net-misc/ofono/ofono-1.31.ebuild
index f668af5ddef8..57a3f703bb57 100644
--- a/net-misc/ofono/ofono-1.31.ebuild
+++ b/net-misc/ofono/ofono-1.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
 
 REQUIRED_USE="dundee? ( bluetooth )"
diff --git a/net-misc/packETH/Manifest b/net-misc/packETH/Manifest
index d49e3ef4d45d..097037420d23 100644
--- a/net-misc/packETH/Manifest
+++ b/net-misc/packETH/Manifest
@@ -8,5 +8,5 @@ DIST packETH-2.1.tar.gz 458750 BLAKE2B c08096e0781fc0174922d2eece31fa5e789ccfd77
 EBUILD packETH-1.7.3.ebuild 560 BLAKE2B 27a2ace9442a787bd95f72e6714ad49a92c73d630ff3920b1052fac4689a51bcc90ea51511e672688174b24fe36fc2a1bf682a99085905cec06c5718e45a011d SHA512 c07a137b43016c4b8f7ba290e1e639324bf3e637212ec6a58f2e9c883998eec0a90f92c1532763a0445c90aba79182bef1669cf3d87ea9c97f4651d70e85440e
 EBUILD packETH-1.8.1.ebuild 581 BLAKE2B 1186c54a0b83364459e874f3c719cfd9fab902243b86de9efc6a23489446b25b59c5f13e072837dba81f0d5d19e687c800d77506abe1dd2c5d1791165101385f SHA512 729ced9c9c86d7136ff99d2bf3c0f323fc4b16e149dedd35114c52c55036a3a34791e3d6f2ae6be9c51f77f178f86c862d292a279f997038b3d7a51c2e38139f
 EBUILD packETH-1.9.ebuild 581 BLAKE2B 1186c54a0b83364459e874f3c719cfd9fab902243b86de9efc6a23489446b25b59c5f13e072837dba81f0d5d19e687c800d77506abe1dd2c5d1791165101385f SHA512 729ced9c9c86d7136ff99d2bf3c0f323fc4b16e149dedd35114c52c55036a3a34791e3d6f2ae6be9c51f77f178f86c862d292a279f997038b3d7a51c2e38139f
-EBUILD packETH-2.1.ebuild 1057 BLAKE2B 258ad14950f81de4baaeb54e0b3a5257aaa32a30503c59c78dcd0cbd842b7c2073af9f60ac7a7e7b81ece454e8acafabcbc5252d2c90e64af042a7b09febd054 SHA512 028f717ed52e7f7843fa3e3b2cbbcd8ddd6faabdd88154412d2a75c9a9fb9af06d68371da13bd52bf90947172671c1701b70c0c7d07cd00ad60ec5d7d8212150
+EBUILD packETH-2.1.ebuild 1056 BLAKE2B 27137a90eae39926a4fe2692047b440e26032fda032ac0f16e1c76a718ca9bdf97c8db38849c4ffcd462846125114d08c8683fa5db8022cb476d01c8beae84a2 SHA512 976cad3aaf4c1bdfc15ac71bb4e6e3e57658c121e547687d40f1cd073eb1484bbdd52b3a64e0948acff9e0f67a0e26409f0fae83506587fdaf86c9585c8de4b2
 MISC metadata.xml 413 BLAKE2B 8d0f984cc4740f606b9dd7633dc126f2dc57a7f07930a8a6f554e254df9f54eee1405179f61b14dec8ecf02bcd13019575c55abeccf404011b97b9aacdd4d7e3 SHA512 5dd67301ca215d9f3d0695d530e137cadec338c90996c0119deea631ac1d3a2219320229556b265fda561e02aba43d9cdf2169725559f95dc40de15951fa6adb
diff --git a/net-misc/packETH/packETH-2.1.ebuild b/net-misc/packETH/packETH-2.1.ebuild
index 83d236e26bd6..1d4deb15c02e 100644
--- a/net-misc/packETH/packETH-2.1.ebuild
+++ b/net-misc/packETH/packETH-2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jemcek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cli +gtk"
 REQUIRED_USE="
 	|| ( cli gtk )
diff --git a/net-misc/pipes/Manifest b/net-misc/pipes/Manifest
index 6ddd05fe909c..f18b6ee4849a 100644
--- a/net-misc/pipes/Manifest
+++ b/net-misc/pipes/Manifest
@@ -1,5 +1,5 @@
 AUX pipes-1.16.1-execlp.patch 603 BLAKE2B fb36b8f00c05b8f0fef930757da458d1f571ecda4487cf5641417d9a79548e28212c1a12599b69a068d55a2e5cb991de0c37b787e13516965122e949bac5db40 SHA512 ad28dab392c962fc476ca6596a0609dbee2a3f6300b27daaaae5b5e44c3c94154b682bc749697be20373b530b228d45170193e085e96bbcbfeff7190746767d7
 DIST pipes-1.16.1.tar.bz2 21642 BLAKE2B c5725244f7ac0b77ff3ac3d753ff96ac7d853cd1e7cb0ab82a14decc6ad6ec94503426be712e1b9117a6e95a95939c5d9e91d9f31eb397c96182fac8f7148100 SHA512 ff8f6cf7934149c3d8a6e0443a06840863313acccd31791913fa25b086173e834d8f357212811e5e1ddb62148d3e687858e8956065734f11d7fc729f2a64b0a3
-EBUILD pipes-1.16.1-r1.ebuild 653 BLAKE2B c85189119d410fc1a6ccb8a1cb8d6e0334c78de0f4860542322b52ffdbdf83b6ce95424d6b61c95100b859aacba6915dd65bc9249de95a0b85363da28d1c13c4 SHA512 7ca3efd197ecc1178046d8cd0266df1ac657f8d123ffcb242d89e1b631de441ac466b9766e5712f2479d2567c18bd0bb85f939b711d19dedb9af733d80cb5d5f
+EBUILD pipes-1.16.1-r1.ebuild 650 BLAKE2B 39fa97f601bac7358a6414f15026efb556c6cb42f7f92d864a6ba12575656c8e312243a537100dd3ac635d06f85d0fb5a5766723c15965df7f4118303c1765f9 SHA512 468e549147fee025b2e766ef3bdeba1bffe7c9075e9c2ef5cf4b1a1d1c749b9071a0c541c62eef7de039da5d9bbe322141ae6d0c3200f7ca9cae918e00f9d5a2
 EBUILD pipes-1.16.1.ebuild 651 BLAKE2B 1d3813f820580d35973a0e894fe5292f8f306e8290ed46b76b43abbfb09b4e258250d658d6daa28f5c8814c867830f9d99834d0cce1b0d2a643c5847c36ae5c6 SHA512 4bcb6448d66a00fc8fc2148100dd08608faef613208036272eb8e412592496da13887a15251694d9626a9149b0b7820f08a9a1d5cdbaa41e6c207a02422032f0
 MISC metadata.xml 1243 BLAKE2B 018079999961b4720d9f6999852b0c6d90ed32d08ac9a2084659d35ccccfd9db602a5ea6540928e1dbf0f942ea06f9cc9358231a0d041eea5aa8620f6a61079b SHA512 64f85cdfbd01bc948cc78a5b0a7816d45583c861cc45144ff0b4547b704516a5151d18b19a99be58ad666f3dcbcd866c215e5a24c237c7b97a35e689841316e0
diff --git a/net-misc/pipes/pipes-1.16.1-r1.ebuild b/net-misc/pipes/pipes-1.16.1-r1.ebuild
index 1e29bc9099ee..d876994479fb 100644
--- a/net-misc/pipes/pipes-1.16.1-r1.ebuild
+++ b/net-misc/pipes/pipes-1.16.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 x86"
+KEYWORDS="amd64 ppc s390 x86"
 PATCHES=(
 	"${FILESDIR}"/${P}-execlp.patch
 )
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index c8d2f1809900..66dc88c9a693 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,20 +1,5 @@
 AUX teamviewerd15.init 282 BLAKE2B eaa5844606cab7942d8117a7f62687f1ba2b3ff5deecf61903d9c01ea5434c8104eceb2e50d1c7a4b93089df53c98fab38da6e6e5f4ee8c18426a7165b9cc465 SHA512 bc2271c1fb360129bf0452950340389e434e420830d7d3f47dcd248151dbbadf798c025d4e47fe311857c070f3dd7b12f0092fa09508f0300963c6e04d8ed7c8
-DIST teamviewer_15.0.8397_amd64.tar.xz 12532076 BLAKE2B a66cc74961edb1eb28b38a77aa29a18c91c86703334903f33e6a7d9cd4dcedcfd92d51636c2908eaa38ff0f024eca97f8b1ad63c396f033efa5039b9fccff5a9 SHA512 f4c9fb9da1b7af9fa1d798c67eb014e906684dab05b41d5618ec21732a4b9b917e7d51e185ca58bc811c8e869f7171136e5a405f9ffd7e8fa5d0b2c7952ed68a
-DIST teamviewer_15.0.8397_i386.tar.xz 13019240 BLAKE2B b14dc20b31d888297602baae65c9ec802e5104f8169090ca3f88b87814f58b81585b9d5b89bfe8478d767b30612ad05ccf2d6a659046c0c5e75bfa287436e06c SHA512 4e1d6101ae8a91e03c6580407857df76505dd216baf172de6a7d00ea308318b8b326f0d15e1d8819ede4d7d758c65608c4446abcfc52ba224e56ab11a623aa65
-DIST teamviewer_15.1.3937_amd64.tar.xz 12898448 BLAKE2B fea1d64c04c5c4f04237ab639b1faf1c6fb027fa5f4824f8a9c0ed31b52894c7a22130d0871dba98388ccf073a5393973350a3e3ea88f94bc5958196a6bb8934 SHA512 23fc65a676570c291184a5c89ce05998cb70ec822d764264de7afaffa47a862e3eb0a4ae9364064fa831165be901dc0b85cb5b79181b8b833638d720504dee5c
-DIST teamviewer_15.1.3937_i386.tar.xz 13443796 BLAKE2B aa9c5f3cd42a123c38a567a117c919c829e089e4c81cf4b6fca0559351895c3824b7a117ac7dc64c9f1129e0cd44dd2347e57644080559a86640a9d8bffbe62a SHA512 8054e5e3901d60bbf210b03209da8afaab03ba95529d1a107a23401a7561c5ee0c33a43837f84490667f0fa282fe8a74087473b7f51f604b675e87d87522302d
-DIST teamviewer_15.2.2756_amd64.tar.xz 12925536 BLAKE2B 94029edb0c333bbab3dc8ed0ad881fc5e5de820a4a92f578781456315d746d1fbf94e7b4d1b651c250c23a32247d2ccf9ba9f9fe839ba188e572ffacebd71630 SHA512 9227388efd819689bd852de62b1dbe122e7081cbec19ba4c96546dd8f889c8b87884fe53231f00f39030882bc150aefaaeedab7d9b3ff28315273d95303eaf78
-DIST teamviewer_15.2.2756_i386.tar.xz 13456056 BLAKE2B cd41db000d5d7fe67f888026146affcfd08495c4e275b1e66ffcc71224b75643713a6f59598eb94aae473d1ec3e9dd500c40e28017bec1f2d50f27f182a01ed7 SHA512 17c0da4599ae1c111ff1ac3069bbb7b613175253a13086c1d564e0ab268317e6249daa3453d686379b3c29cc5cd76a74c2e6654bed8326ee1c8f46e40cbb4888
-DIST teamviewer_15.3.2682_amd64.tar.xz 13066268 BLAKE2B 701a1c53486b186ebdeee8c4611aba5a96155345e2aa484c8aa1c917d6ef12297ae45946604ba23332e3ce40ec60ea5f85b272289630dc27782122b7c4bd87f2 SHA512 27ac18336339406d7aec30a8765ca61fad45756580e82cb506b52b9fb6f94aea96c67065750c2573430704247be93dca757526a97a7d9b41ade9c88fb66dd267
-DIST teamviewer_15.3.2682_i386.tar.xz 13602852 BLAKE2B 4a3ec9062dd2c670395953bdcc5beb923e37ed00ee315c1a051d10b15e16dfe9fcf00f6b1308180a007257edff931c9a210da4b8520963f2ef0df9406e27b9e8 SHA512 bc599059f5d2b9178db39c1d9cb55303493bd734642bc0aecceb8bbe025056a4a61a50055cfb4ed5841787bdf41a6c544603cde13a724f737677d0710157f077
-DIST teamviewer_15.4.4445_amd64.tar.xz 13056296 BLAKE2B f96bfa24fecec42cd591db8e1e4c471d02fa3de927169e449689507694d162d9b2dd0dce252699c81d18a83a5d58f33f70189cfe824e5388b391ed9b198b4459 SHA512 1fc2ff655f7455d3b11a913ef2342539c5845e0490f26c51e9cb4437185b1d0bd4371c9be3b8c4931ee0f1e97c59bbd06414788af6f8cce80579edf2e11a53b7
-DIST teamviewer_15.4.4445_i386.tar.xz 13631276 BLAKE2B f836e68c96d5b0e05c7033504c4b3624d7ab4eed4e0506535ab23e18d2611a506cdc57128bca1b27db3ecb8d4dcdda917f74deacefdd52a0ffc5626417ce62c6 SHA512 d4181241f2732310e9cb2fb7cfda3b9679b26bd9c11a8934d5c528878cb703611b86d95edb44e928b72ee5c127888aa7e27a466698d1ca5515e2a1077a921d52
 DIST teamviewer_15.5.3_amd64.tar.xz 13028200 BLAKE2B 12eec74d2e737d8d091fa100f3a6ff56926257ddd7757f649d2acaacac55c29724690a9bc52bef9c9b966692f8d28d352dc5002b815b4b7e3fd535bb1b250105 SHA512 36a758759e1f0ebfc1e7cd559d5326f51704307373a96d4df1fae5d4e467cd638a9d2c7f4d40c7b2ad47ec4fc66e0f5b432596569b2226d92c18abe67ab01b50
 DIST teamviewer_15.5.3_i386.tar.xz 13562544 BLAKE2B 55d16574968943ae5dd52d523b63ceadd1f74ec7a4440dc476e6498bb3c05cda395524af4d4d4b3b1b94eae5ea22b70bc91ee63c27be90986589d7a8ec50393e SHA512 4022d179aedf8050ddb07f6ae44cac1a08f8f3e8a3b2593c2c3d97ba87f02d6b24db0247b173f64f38ed6128b148c025e0941e2695cf5fdbb443768e93dfd797
-EBUILD teamviewer-15.0.8397.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
-EBUILD teamviewer-15.1.3937.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
-EBUILD teamviewer-15.2.2756.ebuild 4095 BLAKE2B e8a01b0e7e749396705fafd6c178d8e85159a9e4a282ea8ea74c0279e39dc7c5933f8f07883cb57d788cbddf7efb33aebf299c2ee23555fac30fbb6a17b47864 SHA512 177d58dc814db1a593af2f1f64871d8964d4bbdf67f56017dfe0ba60b12fe5f9225e9ff72320f0e0b5e18cb767db814b4ab30f9945729cc3b9bac1d83c20a3de
-EBUILD teamviewer-15.3.2682.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736
-EBUILD teamviewer-15.4.4445.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736
 EBUILD teamviewer-15.5.3.ebuild 4086 BLAKE2B c3093c33cc700ee4e58cc2e99a133b6fc7234254db8f890ef5a0593910f189a0e3286d8cf7bc4feb0a5335f24960568dd6520bd9959b97fc3fe57420e6743bf6 SHA512 c25d94347c9eee586f117b2a90bf858972d79b9a60e0e9317ad59b2f711e817703ca7f27af4e8e05543188c3dc60fd5c414986612e095581bf8bf7536c720126
 MISC metadata.xml 249 BLAKE2B 11f9a85069860d951af16d4536b4dcb5808a383e12932121c0344d7df116522d143eb5e5ccb10ab69c7d6a27ee4d421f4a34557eb02b8b9926d7ef34f3efef10 SHA512 876b15663b8f716c63393d90ad0c78d96088f53a2b2add76b0b749bf69e75be84ef58184f148c70ec2669b773f4dd2e37d045fe72429a6ddd2086b691a553047
diff --git a/net-misc/teamviewer/teamviewer-15.0.8397.ebuild b/net-misc/teamviewer/teamviewer-15.0.8397.ebuild
deleted file mode 100644
index 7c717766d4a1..000000000000
--- a/net-misc/teamviewer/teamviewer-15.0.8397.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-15.1.3937.ebuild b/net-misc/teamviewer/teamviewer-15.1.3937.ebuild
deleted file mode 100644
index 7c717766d4a1..000000000000
--- a/net-misc/teamviewer/teamviewer-15.1.3937.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-15.2.2756.ebuild b/net-misc/teamviewer/teamviewer-15.2.2756.ebuild
deleted file mode 100644
index 96d0e2cc15fc..000000000000
--- a/net-misc/teamviewer/teamviewer-15.2.2756.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-15.3.2682.ebuild b/net-misc/teamviewer/teamviewer-15.3.2682.ebuild
deleted file mode 100644
index 3441acea1e60..000000000000
--- a/net-misc/teamviewer/teamviewer-15.3.2682.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-15.4.4445.ebuild b/net-misc/teamviewer/teamviewer-15.4.4445.ebuild
deleted file mode 100644
index 3441acea1e60..000000000000
--- a/net-misc/teamviewer/teamviewer-15.4.4445.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/udpcast/Manifest b/net-misc/udpcast/Manifest
index c7a4e46d86e9..d28e94433055 100644
--- a/net-misc/udpcast/Manifest
+++ b/net-misc/udpcast/Manifest
@@ -5,5 +5,5 @@ DIST udpcast-20120424.tar.bz2 138955 BLAKE2B 4ba16b9ff86f32bf1f2b07d521fbe1ef057
 DIST udpcast-20200328.tar.gz 169252 BLAKE2B df760dea814fabf951a65dc191a88355dec864d9c0f1be99ea60c742862d0b9944e51a45dd462ffce5c4b56a8d94f719796e3c725b42edae8cb9a19b1d3bc147 SHA512 b1ce4f0cade5db6bc69d3a154c354565675f44e97f9e3d90152f9594fd4f17fff2891eb1cb8d73c59e0d24eeb85e485e96b7a64fa9f1b6d2f005c4cece377bc7
 EBUILD udpcast-20120424-r1.ebuild 598 BLAKE2B 1c86d03e35f7345ef838ca843d31ae8b2ffc4c06df44395568253dbba8de6c2d10ceceebe08cdd951cbb4acfe169f348ae28321c0b870d10019578fabb50da88 SHA512 bf5a998a79b9bbf83d90f45175147514f68d901dea0c664b06ff1293b41025de87a31dd65bf066880ae3366e00d628d504c22fc7bf476d27c42236e367949827
 EBUILD udpcast-20120424.ebuild 489 BLAKE2B 1bc79fff06727ea1875a93e0b02358fe1349c345c086472f86101a2e1f4f528fbb8f64e427e93985f518b9e99524cef9a065619146885faf8b4fcaa0d7f51d11 SHA512 7737a85d20b1023059ea3ddbb4b2403ab70d1dd4fd87cf3c0cd2efb576330bd63132a10b3c917429fa1ce10a7254f38fa00c1f18d5c314a4178a13e64149710e
-EBUILD udpcast-20200328.ebuild 550 BLAKE2B 62fd74aaf81d8bc604b80bbf8dfcebc67920b8699d60f5066e7c1b04641e665f67fe004159fac5b5bf58891cc7cdcd3244160f78f7e64fb8e875341ff6928123 SHA512 6654b61ddec029a90e831a38bc6cc553c977e7026e38eed51d6a800075a79d40a468338cfc87af3ec3c1aaf1fca0f901ae0fb083ad316bb305ffbaf27bcdc99f
+EBUILD udpcast-20200328.ebuild 549 BLAKE2B 23845dfb07fdc0e5f3abf93f376f5d1587991b7d2ade0b7e02a054009f301e71eda260ed2065b0a6129cf8a9e4df4e9c1825014be13d03a9c5d80a7c37ae75e4 SHA512 1a63b729e0979921656aeebb03a0c7f25847868aa83dacf944e3bb4b42e364f0d942adb27d4de720361f768249e3b057367725becb5ed7737786222451acb871
 MISC metadata.xml 692 BLAKE2B 05fdf36d745cd86ccea0a735e3a87fa51d1582f6b47131fbac37607bbf2f874ce813afaf2743f24b454bd4c880332ca9481c3bc0ab03b085e4a09cdc9a490c69 SHA512 7bca2ea7d909286fc510e6ac35ba860ec20a46093b4dc93ac74b29bdb9fdf8acdd8af9111a6614fff15247cd7f739281d12bc19755958dee2c0a20e22cdb43f5
diff --git a/net-misc/udpcast/udpcast-20200328.ebuild b/net-misc/udpcast/udpcast-20200328.ebuild
index 09fdba474f86..2a300d7a0be6 100644
--- a/net-misc/udpcast/udpcast-20200328.ebuild
+++ b/net-misc/udpcast/udpcast-20200328.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.udpcast.linux.lu/download/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="hardened"
 
 BDEPEND="
diff --git a/net-misc/usbip/Manifest b/net-misc/usbip/Manifest
index ca2384ead6b2..bcaeecc39ca7 100644
--- a/net-misc/usbip/Manifest
+++ b/net-misc/usbip/Manifest
@@ -1,5 +1,4 @@
-DIST linux-3.19.tar.xz 81688872 BLAKE2B 0b89e34e62d6fe42f43144fe4f3070df2d9a23831b231918946c1f19a1a4b881095892635983ac7afad902f366b0c6001e46751ed2c96890ecbe9d4056154be6 SHA512 d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c
+AUX usbip-4.13-fno-common.patch 1027 BLAKE2B 20b8a310ee6952b9a2f9496a58b57362a83c578dfe01c772b344afd7af4c5b469a415d2a7104629a9525499b0e933fd4fe6881620a950060247fb8e9f2dd9c12 SHA512 9d11fcb07f4bef9494cfe52160a2c4b6f7f88e4a9488afd39f77bcbaf5b5d3e07b8aa19fd7387ca37adb7e2637167c71b7389ff4cdd3acf3b4f0071d3271e60a
 DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
-EBUILD usbip-3.19.ebuild 1177 BLAKE2B a45830a8824c875cf6eef765e243ec49a05ff9869dbcb534d8267ba7de0cc5c037fab847e720717a21bdf5f56dfab0295aafe080718bea174c1d05ae220e561d SHA512 46f5a579e8e3051aee38f5d89803bb1d34de18f218b3ed404a4ce0018b6ea73988614a55f2d3c54f0095d4b7bac131580868d8a13b40759fb04346c80c6cf2fc
-EBUILD usbip-4.13.ebuild 1222 BLAKE2B 6b66773b165741225f41a7df753fe93e7a83090254c16a779fcbfea4d235beef6e20157f14c07df3e8de1710ff411891962c078a29be6ef7876bf1d8dc273fb1 SHA512 023a798189dc15bd58e962c0869003a650ee9cebe9c43b934c3c517aa5072771e4369fbcd0242ffe21b139a1f262b6505461a659397999db1d7a6cef8166a306
+EBUILD usbip-4.13-r1.ebuild 1230 BLAKE2B af3b55afea8eefbc2c34b6a9231f2a885d8ef61d30907aa8c0d31505cf3dd5ec7570d784ba5600fb9da7f046ee81c73046eb4ca20a0044d2674c3531439f507e SHA512 223fe1747dcc0708f6875ec91b0202818ebe6fd414dfc2c859273e5ca1cf9ff3493c2de982ddf5394914deb5cc59728fd043e818d3633a9b2c6c178de5144554
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/net-misc/usbip/files/usbip-4.13-fno-common.patch b/net-misc/usbip/files/usbip-4.13-fno-common.patch
new file mode 100644
index 000000000000..b8ffc40c4b9e
--- /dev/null
+++ b/net-misc/usbip/files/usbip-4.13-fno-common.patch
@@ -0,0 +1,44 @@
+--- a/libsrc/usbip_common.c
++++ b/libsrc/usbip_common.c
+@@ -14,7 +14,7 @@
+ int usbip_use_stderr;
+ int usbip_use_debug;
+ 
+-extern struct udev *udev_context;
++struct udev *udev_context;
+ 
+ struct speed_string {
+ 	int num;
+--- alibsrc/usbip_common.h
++++ b/libsrc/usbip_common.h
+@@ -53,6 +53,8 @@
+ #define ST_NODEV	0x04
+ #define ST_ERROR	0x05
+ 
++extern struct udev *udev_context;
++
+ extern int usbip_use_syslog;
+ extern int usbip_use_stderr;
+ extern int usbip_use_debug ;
+--- a/libsrc/usbip_host_common.c
++++ b/libsrc/usbip_host_common.c
+@@ -23,8 +23,6 @@
+ #include "list.h"
+ #include "sysfs_utils.h"
+ 
+-struct udev *udev_context;
+-
+ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
+ {
+ 	char status_attr_path[SYSFS_PATH_MAX];
+--- a/libsrc/vhci_driver.c
++++ b/libsrc/vhci_driver.c
+@@ -15,7 +15,6 @@
+ #define PROGNAME "libusbip"
+ 
+ struct usbip_vhci_driver *vhci_driver;
+-struct udev *udev_context;
+ 
+ static struct usbip_imported_device *
+ imported_device_init(struct usbip_imported_device *idev, char *busid)
+
diff --git a/net-misc/usbip/usbip-3.19.ebuild b/net-misc/usbip/usbip-3.19.ebuild
deleted file mode 100644
index dd1e0ccb381a..000000000000
--- a/net-misc/usbip/usbip-3.19.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ETYPE="sources"
-K_NOUSENAME=1
-inherit autotools eutils kernel-2 ltprune
-
-DESCRIPTION="Userspace utilities for a general USB device sharing system over IP networks"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI="${KERNEL_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs tcpd"
-RESTRICT=""
-
-RDEPEND=">=dev-libs/glib-2.6
-	sys-apps/hwids
-	>=sys-kernel/linux-headers-3.17
-	virtual/libudev
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS README ../../../drivers/usb/usbip/usbip_protocol.txt"
-
-S=${WORKDIR}/linux-${PV}/tools/usb/${PN}
-
-src_prepare() {
-	# remove -Werror from build, bug #545398
-	sed -i 's/-Werror[^ ]* //g' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use tcpd || echo --without-tcp-wrappers) \
-		--with-usbids-dir=/usr/share/misc
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client"
-	elog "machine's kernel config and USBIP_HOST on the server."
-}
diff --git a/net-misc/usbip/usbip-4.13.ebuild b/net-misc/usbip/usbip-4.13-r1.ebuild
similarity index 77%
rename from net-misc/usbip/usbip-4.13.ebuild
rename to net-misc/usbip/usbip-4.13-r1.ebuild
index bfb8473198b7..453bd87fa8fd 100644
--- a/net-misc/usbip/usbip-4.13.ebuild
+++ b/net-misc/usbip/usbip-4.13-r1.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 ETYPE="sources"
 K_NOUSENAME=1
-inherit autotools eutils kernel-2 ltprune
+inherit autotools kernel-2
 
 DESCRIPTION="Userspace utilities for a general USB device sharing system over IP networks"
 HOMEPAGE="https://www.kernel.org/"
@@ -13,10 +14,10 @@ SRC_URI="${KERNEL_URI}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs tcpd"
-RESTRICT=""
+IUSE="tcpd"
 
-RDEPEND=">=dev-libs/glib-2.6
+RDEPEND="
+	>=dev-libs/glib-2.6
 	sys-apps/hwids
 	>=sys-kernel/linux-headers-3.17
 	virtual/libudev
@@ -24,33 +25,32 @@ RDEPEND=">=dev-libs/glib-2.6
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-DOCS="AUTHORS README"
+S="${WORKDIR}/linux-${PV}/tools/usb/${PN}"
 
-S=${WORKDIR}/linux-${PV}/tools/usb/${PN}
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_unpack() {
 	tar xJf "${DISTDIR}"/${A} linux-${PV}/tools/usb/${PN} || die
 }
 
 src_prepare() {
+	default
 	# remove -Werror from build, bug #545398
 	sed -i 's/-Werror[^ ]* //g' configure.ac || die
 
-	default
-
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use tcpd || echo --without-tcp-wrappers) \
-		--with-usbids-dir=/usr/share/misc
+		--with-usbids-dir="${EPREFIX}"/usr/share/misc
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-misc/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest
index 1a5dbdf8cf54..23d483ed66e6 100644
--- a/net-misc/wakeonlan/Manifest
+++ b/net-misc/wakeonlan/Manifest
@@ -2,5 +2,5 @@ AUX wakeonlan-0.41-ethers-lookup-r1.patch 2287 BLAKE2B 95bacd277caff21b056f3a8c1
 AUX wakeonlan-0.41-ethers-lookup.patch 2284 BLAKE2B fa45175d623a3e4cfb5b79ec4f499401b798a8fc3e4dd10a8d580f02083334db32ff5f925defb72b71d6ceceee3017d3bf9a4c2ef2559c9eb8e9d92e6e25a63e SHA512 39cdee0f2732f4d09822cbb82e4674e966b1648fbdd84b4a8adaf3b734ea2e8e4b5f0d535f7d70dbf3608c23ddc0761de9c5892a5c6c73613f322dc4e71db3d2
 DIST wakeonlan-0.41.tar.gz 6028 BLAKE2B d560c7dd830daf596ffd7d797d1908d1fc90d20c6861a0e341b20eb38137b809fe1a78819f9ca729fa06f88285cfb22d0719092bed1d49d9763a7e2bb8a986bf SHA512 192ed2ad157e3f5af01632b8f2b727e232448e5a9bff6aec25298fa9913ec38f1036b665b141b5299994c88b1941d9896b6eaa92cfdb44d65db3628f50e3824f
 EBUILD wakeonlan-0.41-r2.ebuild 656 BLAKE2B d54b3d423bdc9e563beb94b7ff7a8bd11e15c2db232125966ce2f3036efec681d521f230b71cb245503ad890a8b4c606c7e59357370009d04d5f335a8628e670 SHA512 f1d799b8372909276834149a272340471e8a97312d4c5821f53c2382159dc160f8d2b4ab8ae60f9764fddbb5ee88df0703452a532b76571a4b099241b62b93cb
-EBUILD wakeonlan-0.41-r3.ebuild 648 BLAKE2B 7b2adad378c0ea62b111f78593c84997a8b6321ecf5d5162d77423a3efb7e79156e2a308d6ee597bcadec0bc7fe4377e3086d7f9d7f2479f396701ddf09360b4 SHA512 ba655f402532977613f2bc38ef999dce34900f56dcf456e4f017944dde54f977f49722c23231785a1d63b269786730dad95c6adb84cab575d68934b20ccbdab1
+EBUILD wakeonlan-0.41-r3.ebuild 645 BLAKE2B d9e6dc21fe44371d3d35d1a88c9a8e307664090e6bbc51be9b8b6235e3aad62bcb0ce41448abca0f5852d126a98f002818ec5ab4c1430df6dfa55b4153315949 SHA512 0c9e825975c3fee058eb1cae62d685aea279c96f44291a1bf7b806288f9e5bb0168e96ef4140a5eb96a1fbf556054ab50e6b377b7a15dba8a0264a49d4bbf483
 MISC metadata.xml 252 BLAKE2B d5ae1c6434a18a4052d21b9d34d573fceda4a6a37f4f0f1001fcd8c5d7d179d6f6d7df0f611b7129eddeb894dbcbf573d9c22f25dfc12fcd989900efe48b3512 SHA512 84cb947f6732467eb3137a917ea484aed7b45f56115790f8fb6595b73d0a558e03f379e239db903e4741934744c8eb10237382be10788787c684fafc854527d3
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
index 2ac0dc29d53b..3033294e61c2 100644
--- a/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jpoliv/wakeonlan/archive/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index f03a4b3cbb16..c1969ea508e5 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,9 @@
+AUX youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch 854 BLAKE2B 31c948c2fa82ba431c2b31eab9c29a55cbf5bb59ee2eff7a683c5549d30935bbf96be479cc920196408027c34dff818d409e5aee875855ba56be42aa879f5079 SHA512 7bb9a264dcf4a5691460fe537fcb64e11f7f02a54d29590375e5630489688ae940d66818966690916aa0b6ec8b54be730b0f39efa168554e644a1b68bcba33a6
 DIST youtube-dl-2020.09.20.tar.gz 3188480 BLAKE2B c12ee589d112155207b59da9f710b2c776c07464d5c64a5d8355b963a81765b0dbc65df4f9564504fb963f30d5a11dc7e662c14d58ddf9fe6347352363cf70a5 SHA512 ed511016d0cfcbbee0cd651f793cb31cdb46d80243f86186de1cc54cb2a2055fae2f5cc3e16f838fc2ba47f3ff6f3b484219c8a707904fbc30193a2b28a1e30c
 DIST youtube-dl-2020.11.26.tar.gz 3218922 BLAKE2B 4e8ac926a7cef9d8a9f53de1002464e4d3a632d09c6564e1451a7bc49fe4cdf72e206f98df58a4025d55718f46d84fe4f1f6e23268ef19ad3ebd11725d5a0fcc SHA512 126c299c3db654ad3c88ced44bfc1a34bd73a439d8d3fd64720bb5d06fe84df817182a9e0b38d1def2eb4f1de26c7e2b8b6d3d6b4282f973db548c9868938a41
+DIST youtube-dl-2020.11.29.tar.gz 3222467 BLAKE2B 6b699689f55fb5b24d9a3fa9b500461076d9cac58a111fde5f07f4df45113d40cb2cfbec2b86777b92277fbe16467c1516fdd5bb49e30f8361dd7fe3479eca57 SHA512 e3b4e7e7a776a608d2ee34c5395108445ea43fc999b0364a686eddb5d5977591d2c625b2a97955fd565631da070921f3196cd98ce58cf9aebf4e504636645a3d
 EBUILD youtube-dl-2020.09.20.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
-EBUILD youtube-dl-2020.11.26.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
-EBUILD youtube-dl-99999999.ebuild 2074 BLAKE2B 7eb91fceeba248ff2a1b40ab97139da9a33211b2fe79c66ae6aa29a2b6fe1f2b4e400f4dcc655573d46b6fa9a7f3cb7baddc75a32739b89507db9d4f4f96eba3 SHA512 f9768251f05033b9df5a0ea82d9e62f6d8fcf651dbbcf72a300bba4caf22ca5b99af73b830eba2d5483ae9b227d99f02bfa015319303f7f7300e6106f1e0b342
+EBUILD youtube-dl-2020.11.26.ebuild 2234 BLAKE2B b77ce7a214ccaf5b4512402f406cecf6f770832cb1ac99fb9ad3f7d087b985a0c9d4db1de7e661e9a0bc583d2548286221c6402911d190f8ac77d0ea8065136c SHA512 e7416bca93ff11567f98bf293a1adc66bfcc9dbd6c9be39c6e292b46cdadc96e68ae03710cb42cd521e0893793e19db86e4e90e5376c37ef5172be464226e3cc
+EBUILD youtube-dl-2020.11.29.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
+EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B 7eb91fceeba248ff2a1b40ab97139da9a33211b2fe79c66ae6aa29a2b6fe1f2b4e400f4dcc655573d46b6fa9a7f3cb7baddc75a32739b89507db9d4f4f96eba3 SHA512 f9768251f05033b9df5a0ea82d9e62f6d8fcf651dbbcf72a300bba4caf22ca5b99af73b830eba2d5483ae9b227d99f02bfa015319303f7f7300e6106f1e0b342
 MISC metadata.xml 353 BLAKE2B 53a5a71088d6c6ba1785f245c36c8c7551eb800b308313a053cfb5f292df1adce321383522528a06742aabee8f5d7fe8d2d9805c28632fce1d50f6a938b163a0 SHA512 01570d01232abde7a0d3983e307197cd07ad010f57f5df49048405b45fe2e1f2aeb0594260014bd4d95a6f234885e29ac802111402df3707d41b4b0f75b7457b
diff --git a/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch b/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch
new file mode 100644
index 000000000000..c48760a4c41c
--- /dev/null
+++ b/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch
@@ -0,0 +1,22 @@
+From 99de2f38d375f794ffdc4f5a110a5227310f3ab0 Mon Sep 17 00:00:00 2001
+From: Remita Amine <remitamine@gmail.com>
+Date: Wed, 25 Nov 2020 21:39:17 +0100
+Subject: [PATCH] [spreaker] fix SpreakerShowIE test URL
+
+---
+ youtube_dl/extractor/spreaker.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/youtube_dl/extractor/spreaker.py b/youtube_dl/extractor/spreaker.py
+index beee6670c..6c7e40ae4 100644
+--- a/youtube_dl/extractor/spreaker.py
++++ b/youtube_dl/extractor/spreaker.py
+@@ -126,7 +126,7 @@ def _real_extract(self, url):
+ class SpreakerShowIE(InfoExtractor):
+     _VALID_URL = r'https?://api\.spreaker\.com/show/(?P<id>\d+)'
+     _TESTS = [{
+-        'url': 'https://www.spreaker.com/show/3-ninjas-podcast',
++        'url': 'https://api.spreaker.com/show/4652058',
+         'info_dict': {
+             'id': '4652058',
+         },
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
index 47f8343b521a..82be3f810520 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
@@ -22,6 +22,11 @@ RDEPEND="
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
 "
 
+# Only needed by this specific release, already fixed upstream
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.11.26-fix_spreakershowie_test_url.patch
+)
+
 distutils_enable_tests nose
 
 src_prepare() {
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild
new file mode 100644
index 000000000000..47f8343b521a
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/flake8/d' Makefile || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	emake offlinetest
+}
+
+python_install_all() {
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
+	elog "On some sites - most notably YouTube - videos can be retrieved in"
+	elog "a higher quality format without sound. ${PN} will detect whether"
+	elog "ffmpeg is present and automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild
similarity index 100%
rename from net-misc/youtube-dl/youtube-dl-99999999.ebuild
rename to net-misc/youtube-dl/youtube-dl-9999.ebuild
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index bece766f55e3..e15f909c94d0 100644
Binary files a/net-news/Manifest.gz and b/net-news/Manifest.gz differ
diff --git a/net-news/snownews/Manifest b/net-news/snownews/Manifest
index bb32d2c529a4..f4e8ebd8f64f 100644
--- a/net-news/snownews/Manifest
+++ b/net-news/snownews/Manifest
@@ -1,7 +1,3 @@
-DIST snownews-1.5.12.tar.gz 167944 BLAKE2B c629bfa53860a031a6afd3a82d44747e61780b03e5a74bb9db4b8c22b441870a8345317d901ddaf42de62aee54685d6329c49343821005ea211c1e17932bf755 SHA512 7a7ccd5ea57f8bbb73f1429ab931a38203e858c74a383c5347e66088b84f6a7240feeee99e179687ce0a7a89c6c1406ce20d6c5d6771d25a0a0301fa5526e220
-DIST snownews-1.5.13.tar.gz 199931 BLAKE2B 1e68fb46a0fdcea67281adb5334b4e90cb4b520b9d54dafc05e181c5f3ea1f552b80d4835fb0d0d00d2efc8d8cecf0554b547a4e029de49ecc01fb7dc2722c0e SHA512 dd91968141a44f4277eb9f333a5fe06c60805aae6fe36900cde55b85afc254aaca48d06e86b1e9d65b6bcaea76ca162d75d2160f46cb15539776a3f29f990963
 DIST snownews-1.6.10.tar.gz 189715 BLAKE2B 0456faa526b21d06c5a7fe70f52cffbb3c7d977afcc4a5bc80179fd928b9c00d0674d44a64342a469a1cbccd3a1e0264ecadc1065f5a85965d9ef76fc3d3d896 SHA512 df90c3c55da8d11b2936075aab86f66f54f9a6ace0cbe0db54d0e6177ae71e28ab3c700d79b521d55859bb94ef7ecc89e3eb69f215eb9f7286d30cc4e2bec078
-EBUILD snownews-1.5.12-r1.ebuild 1271 BLAKE2B 743f793aee32279829cf4bf7f75f345838dc488c1083b46142af0752cd4162bf1438ab64254adc408699ec3cfc736ddd9fe7b459f8f5de92b0e26ceb00f5c8c4 SHA512 aca49d061db8c372b2100b0a9e4dc252f3645b7b1ff4b5932aaae25a844fb803eb75e07e6ffb4b1954632043b8e80f9e3452aaa67eae2b0352fb9818f6429c98
-EBUILD snownews-1.5.13.ebuild 1065 BLAKE2B 0332a5d0050fd84ffe1748c360cd489e401e31cdf850df9d6bc1a5996e9c0c45977cf790ef37a4785a818a8704386f7dc4f2bbafee3a2fed3873b4755dcd2ff5 SHA512 b9e5f148ef3dfa2b23f7db97ce803bec759dd0cedecf03bba49cfc3ea62fb08d1a9b723e92aab6cd9e7436d51479e37aad5320aeef6c54b113d92b1e87f94a59
 EBUILD snownews-1.6.10.ebuild 1075 BLAKE2B 20e1b36c01f003646a23da4da1466e24752a49f1e1870163a5f3dfc4fe5cc9d2e743a099a4d059f61921a2d3489fe534ca856e12987b3b01d1dc269f72f7bd2c SHA512 d72d52287a245862240cc4bdafbb96b4cdd57c9364bec739921e19af0ab64b959a32b421b1dabbc8dff1f5c3f2ecd323974aa722aaf5a2f3cc61f0d3d70af6f3
 MISC metadata.xml 363 BLAKE2B ee398b88367b0004f371ce5afc8580a4a2e115485a1e3f882369f9046c49519891b6ea6fa50fb4a33079c0c63639efe1fed8ee5d286dcfbebe216a06d4e1b173 SHA512 a19c917a1e76ae139fba6a947b896783c6c700c350e56bd1ed32ccbfbc9e28bf8cbdd074ec29aadfc98eee1339926582bae8eea87e8b596c6368e298b7a44bc1
diff --git a/net-news/snownews/snownews-1.5.12-r1.ebuild b/net-news/snownews/snownews-1.5.12-r1.ebuild
deleted file mode 100644
index fcc9eb54801c..000000000000
--- a/net-news/snownews/snownews-1.5.12-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Snownews, a text-mode RSS/RDF newsreader"
-HOMEPAGE="https://kiza.eu/software/snownews/"
-SRC_URI="https://kiza.eu/media/software/snownews/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="unicode"
-
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.5.6
-	>=sys-libs/ncurses-5.3[unicode?]
-	dev-libs/openssl
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-perl/XML-LibXML
-	dev-perl/libwww-perl
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e "s|-O2||g" configure || die
-	sed -i -e 's|$(INSTALL) -s|$(INSTALL)|g' Makefile || die
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-	if use unicode; then
-		sed -i -e 's|-lncurses|`\\$(PKG_CONFIG) --libs ncursesw`|' configure || die
-	else
-		sed -i -e 's|-lncurses|`\\$(PKG_CONFIG) --libs ncurses`|' configure || die
-	fi
-
-	# perl script, not autotools based
-	./configure --prefix="${EPREFIX}/usr" || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install
-
-	dodoc AUTHOR Changelog CREDITS README README.de README.patching
-}
diff --git a/net-news/snownews/snownews-1.5.13.ebuild b/net-news/snownews/snownews-1.5.13.ebuild
deleted file mode 100644
index 93c384ef1664..000000000000
--- a/net-news/snownews/snownews-1.5.13.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Command-line RSS feed reader"
-HOMEPAGE="https://github.com/kouya/snownews"
-SRC_URI="https://github.com/kouya/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="unicode"
-
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.5.6
-	>=sys-libs/ncurses-5.3:0=[unicode?]
-	dev-libs/openssl:0=
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-perl/XML-LibXML
-	dev-perl/libwww-perl
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	tc-export PKG_CONFIG
-	sed -i 's|-lncurses|`\\$(PKG_CONFIG) --libs '"$(usex unicode ncursesw ncurses)"'`|' configure || die
-	sed -i 's|$(INSTALL) -s snownews|$(INSTALL) snownews|' Makefile || die
-}
-
-src_configure() {
-	# perl script, not autotools based
-	./configure --prefix="${EPREFIX}/usr" || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}"
-}
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 0360b7d2ed39..c788cbe125b6 100644
Binary files a/net-nntp/Manifest.gz and b/net-nntp/Manifest.gz differ
diff --git a/net-nntp/slrn/Manifest b/net-nntp/slrn/Manifest
index bd4ecec2ad22..6e239ea7a02d 100644
--- a/net-nntp/slrn/Manifest
+++ b/net-nntp/slrn/Manifest
@@ -1,6 +1,4 @@
 AUX slrn-1.0.2-make.patch 1044 BLAKE2B 4c2100b402e57383ccca4dd26a25bdea05ae065f978c1a96ea53881b859e5fd7a28a1d6c54ef59fcc21238c456a19ad953f8c1e78d2d7c573779e4d78291f3a6 SHA512 14859999f7739121027a7ddd6b0f157534a3e64a5c63b2354c4962c0391b9fbc5b4f80bc4260909561b534d79abcb3bdcca6f737eb52029f9c48cb0aae5f6473
-DIST slrn-1.0.2.tar.bz2 995433 BLAKE2B e2812826252918547d5cfb810233b8e0d19bb7df44577cb118ff51064648579f90132c88b5872400cac70cca5b91731d1ede39c4e0521d75d989a5d4417d78c6 SHA512 264dce88622e544356782c483f3639252ba57408d79775b2cd3ea06962ea3ebc568bc45ed19f1690c66b5b71d82eadeebd62a0bad656b1339ab7b80eb3f3cc5f
 DIST slrn-1.0.3a.tar.bz2 997138 BLAKE2B a349783edae24e0269ab1b8ddc328e578340e40e72285bbf070237b3724f475450f08bbc655d3b212684b8fffc495129008bde71a481fb3d2f4326bf396e5981 SHA512 11cef2dfe41f441af15acc22fb675cf607e932f0dd6d4a998e51ecda05c9a50d7abf10a3e693ffc857ad77e09634f460404e4d5b289169e7bbffdaf5d6d565a3
-EBUILD slrn-1.0.2.ebuild 913 BLAKE2B 60381f6a2b434102b2f479e3e71c89662af1aa32d1d7adb8ca11acbb07c5991fb7abe959888c855144274b92607755986db11b5ced2a24fa1875c5f8dd8364d9 SHA512 531084e04e6971e49f98130116e5391136897069f231e1b304f3c797a98605384a7bbfe55af26165e5af15186d7caabac761a4c19850514390f976ae70bec9e9
 EBUILD slrn-1.0.3.ebuild 888 BLAKE2B c5ec19c114aa6067a8891c8985882edfd5e607f12d49ee407e9f9dde26509c57755165d5f7bb69c4a3a0208265eda81a3fa7be153dc510375d96f032fb008e82 SHA512 4ef798fa757df7bf5567a5d44a14d796d16de912044d4671f8579c80fff418e25b3774a180e20845d9e6282ba8e2cea8d3b1dac0db7f9f569f4838ae7042da48
 MISC metadata.xml 659 BLAKE2B cec81f9a34085c1394887cd2456aead6d9791d515f8ba56264ec37dee3c382a869ee59cd5d191820917999135cb9eb2b571531ef8e992c49bed37ce2ff64eb59 SHA512 96c12fba55179bf63aa81e54517cca962f7724c95d89ebc4048c0fab89a14acf3c3c541fa489593570b9a3afb1f88f85302278650c2224b9aea1f2e749c0cafa
diff --git a/net-nntp/slrn/slrn-1.0.2.ebuild b/net-nntp/slrn/slrn-1.0.2.ebuild
deleted file mode 100644
index 8086fab4307e..000000000000
--- a/net-nntp/slrn/slrn-1.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-utils
-
-MY_P="${PN}_${PV/_/~}"
-
-DESCRIPTION="A s-lang based newsreader"
-HOMEPAGE="http://slrn.sourceforge.net/"
-SRC_URI="https://jedsoft.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="canlock nls ssl uudeview"
-
-RDEPEND="virtual/mta
-	app-arch/sharutils
-	>=sys-libs/slang-2.1.3
-	canlock? ( net-libs/canlock )
-	ssl? ( dev-libs/openssl )
-	uudeview? ( dev-libs/uulib )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-PATCHES=( "${FILESDIR}"/${P}-make.patch )
-
-src_configure() {
-	local myeconfargs=(
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--with-slrnpull
-		$(use_with canlock)
-		$(use_with uudeview uu)
-		$(use_enable nls)
-		$(use_with ssl)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index debd1e0a5e0a..c7a947727d45 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/mktorrent/Manifest b/net-p2p/mktorrent/Manifest
index 55bac48d76d0..496ac4ed5547 100644
--- a/net-p2p/mktorrent/Manifest
+++ b/net-p2p/mktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST mktorrent-1.0.tar.gz 23089 BLAKE2B debfdbf2691fd1baa9f1647ef1cd64a4e5d8cbcabd77fb7c8a4b7ec5c1abbf4fa56ae54ea51afc58b0807cde8d525c4ac7106d38576e52a71e2776ba0bfcacda SHA512 f103c8860c008796c2dc604fcabce7374264fd7814237fcad5f9dab0fe10e927b0e2d9b58e7462dd198265a7d83fe30fd68313c7dce4029d8c331a6f2d4622de
 DIST mktorrent-4c221a05d949a3767a2671de139c6014909daf6b.tar.gz 24574 BLAKE2B e7dcc17aca52c8d1f9d816ce3e89bea5c2b1d7759dba6a00578960b253652506b7e61855d769440056aaa6b0719e6856108ca5b80977152746a648862c71e97b SHA512 49ba2697373a1b40829d50d66faaaeb57fa3893e97283ec2844b447b8e4cf2713d7c0e76e49d3893475f5ce298c3215249751defe0f952d2c52df1bf68f7706c
 EBUILD mktorrent-1.0-r1.ebuild 771 BLAKE2B 57060402de8e6986f469b69efa29d7983c656acd06fe2dd689b355f80f99070d4fb81d8c736701bd258b673f15e42fe40466c5abbacc79142138216e2e7dbdb8 SHA512 cff3ed23f2c2e6495de9b92434d0cbaf9509fefa9ac0e258af44ee549824e3c4be9865148ca7d9c011a36fc0f2b9c7e2eae9930b4893f2e5dc678ac188998656
-EBUILD mktorrent-1.1_p20180912.ebuild 1050 BLAKE2B f81e21c7f1674674e51648abd57d70f735c8109fd6a551e5829053ee2d13dc1155fe45cd1b60e2e1a5bcbe4a0351d623bfdb8be4f0454fb13aae71f1306ab80a SHA512 dd83d9552476bf81c64df1cbffcf44cd02ce6b54f3f6262f8c376af139afe5f70970c5d0cf220d5227c2d6459c8944f89460110d09d285a636d619532f360fbf
+EBUILD mktorrent-1.1_p20180912.ebuild 1020 BLAKE2B f048a0eba3eaa397d3012c11691a82247e7f1f4163faa573e1c43e0780ce9dc8fb44592c79eeb8ff45f99ae12f016815ca78553341247c3fec476d9d878c0a3a SHA512 e65d8072575db0bab10bbc34903877f5d4d5906dcb3bb035c045a6762390cc6baa6f8af585d9eccb7c8dacd3908fe3da8688ab0facd11d31db20c747a2762382
 MISC metadata.xml 446 BLAKE2B f5298ced2a3c59bc990eebd8d183815e8449191b11e48e31aea3948944cf67e79ab649922c104a0a644d8f4de6bab044175a2bb64fe3124f4a317fb98be7deb9 SHA512 6dc7c65acabf5e556235a4c5e95d77301d8aa92acf2d82d6c50afe761095637c8f08616d40b6a34270894ba9baf9bfef33f060e3c8fe67e3ee92a9bfad1f68b7
diff --git a/net-p2p/mktorrent/mktorrent-1.1_p20180912.ebuild b/net-p2p/mktorrent/mktorrent-1.1_p20180912.ebuild
index 455a6b3c4791..bc2ff912f7c7 100644
--- a/net-p2p/mktorrent/mktorrent-1.1_p20180912.ebuild
+++ b/net-p2p/mktorrent/mktorrent-1.1_p20180912.ebuild
@@ -13,13 +13,12 @@ if [[ ${PV} == *9999 ]]; then
 else
 	COMMIT_ID="4c221a05d949a3767a2671de139c6014909daf6b"
 	SRC_URI="https://github.com/Rudde/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PN}-${COMMIT_ID}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	S="${WORKDIR}/${PN}-${COMMIT_ID}"
 fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
 IUSE="threads +ssl libressl debug"
 
 RDEPEND="
diff --git a/net-p2p/transmission-remote-gtk/Manifest b/net-p2p/transmission-remote-gtk/Manifest
index 2ec2cdda04d9..b667e0d07596 100644
--- a/net-p2p/transmission-remote-gtk/Manifest
+++ b/net-p2p/transmission-remote-gtk/Manifest
@@ -2,5 +2,5 @@ AUX transmission-remote-gtk-1.4.1-gcc10-fno-common.patch 748 BLAKE2B f22473d0f56
 DIST transmission-remote-gtk-1.3.1.tar.xz 459260 BLAKE2B 3e1e184ce6fe0698996763419e5d8b1fc187d7c17ba42e9d75463d6b772bdde554fc1d4b6da6f19a936762b315caa0cea64c47e587d10c592402fb87a518cf66 SHA512 ce723d51f8f769e59fb539241996ff0204a654f52696963044f8535731cc2b8ec69cf454a15253f9ba214e0879498f3c19519b5b1b303273d667592887ee45f5
 DIST transmission-remote-gtk-1.4.1.tar.xz 543620 BLAKE2B dea556138a7f554a6cbe5c3e0d5bdd9057cb61d2d80e2d89beb96b2926218e19ce85759fd079375ba8896e185bbdec74979372a9413dc5c513204f47b93e4304 SHA512 c1a2c26d01bc2557bafae9baa370f713e0412ac8445e12b19e9b3027c1a269745dbb865195d683af397d43a2956f51aad8bdfcaff93e4f07015e33715770de48
 EBUILD transmission-remote-gtk-1.3.1.ebuild 1356 BLAKE2B 7e14191b28c54a9f773ad05ecc8a1bdd5d62704061657e319e4b5eb8da7b56bd1673b9923499d22848849faa05b59b1e8e8d6f4cfbb17caa35b2141b76f0dbb1 SHA512 c89c23aa0bbd750e614c81eb56c67df212b9ee66fd6f40a3c4276465a14aaff7defea205cb2acd8e39e29bcbfd7e7fa2bcd1cb3941e9eefd2203b9309e42cca8
-EBUILD transmission-remote-gtk-1.4.1.ebuild 1336 BLAKE2B 1830c7c62f872446e30246a767edc8653e2dcb73052827b8a0256a31a9339496b9e40efa4f2a097de22625590ed1831413f9b4b9485645a5652159335ace14eb SHA512 e225a34eb02f16d2250f9334266a6f2b9c8ac74749891333d9f4bf2869baeec67081511bdef1fe6eaf081b6857353a3f413646c9a8a299ae757e3b54caf35155
+EBUILD transmission-remote-gtk-1.4.1.ebuild 1335 BLAKE2B d15bb13084c28d455e3162cbef3e3f2d16c5e1ad8c873d4c7f3e3193d79dbb272d8a271e4f3c70b34c6483cc7796330ee8db96dd84f9cab452078d0876afc5c0 SHA512 500420fd254906e8115e918678c278c3de39fa6bf89bc5e0320764c1d7a1bf57848c2f2577953766191381a563a353c51840a279b1e60d1b922501c57f618e8e
 MISC metadata.xml 493 BLAKE2B 91125c81c02f7249d6d99436f02900f5bb559ebdec3634d8c2ad3e341f9a98849dc051be6fc8c4ff4b77146a1f66977d04ce88588f4f0691322ece06e7bb8aa3 SHA512 722a8a74d8afcf72ddfbe0d092bef518da4ed2e146c6215736f07deac15bf159b5793548de2409a8dea6dda5b1ca033b4bce92b63e11ad7b290b4b8bc99fc45e
diff --git a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
index 38e770e754bc..4383f8c7b077 100644
--- a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
+++ b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ayatana debug geoip libnotify libproxy rss"
 
 # RESTRICT="test"
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index b04c80b404aa..c3a16af40a3d 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest
index a4594a86ed3d..2f38b7290d20 100644
--- a/net-print/c2esp/Manifest
+++ b/net-print/c2esp/Manifest
@@ -1,7 +1,6 @@
-AUX 0001-Fix-various-missing-includes.patch 1107 BLAKE2B 36063d8bf6025e4c7df3151b3b3da868d0850bde7ed28e4c5c7c9ce604709e1acb8473cd54bce7643df710ed51ac1aad56c1a42ca24ebda791cbdfecbfb8bf9b SHA512 90dc8880864ec2aed498ebba2173c07697f8136bc95788f0e3e446fe16519857288c07c0a67c5a319c19837550e0b52e38a788419ffc85ebcbc0434edde2c0de
 AUX c2esp-26-ldflags-cppflags.patch 1152 BLAKE2B dc5463e1574c0f8852cbcb567fd24a0bc7f29a537d3073f4b6835cdf54deed2d3d3595816ae0ba84e4f026edf66daa3dbe4ad66765b47284b9862765656afd2e SHA512 c85abc2a3511ee7cf4ab4045c77ac257d85579354c98403a27209a21915fcd2180053db86fef09151d5e52e98684f46e14bd57bae9f0250597c451286fbe3da4
+AUX c2esp-27-fno-common.patch 1208 BLAKE2B 20158c4ae4e51cb91758c95bd5821f813d0ad7d1ebd7a9da2471037f74dbbffdf4fcd13309ae51e2b47c47abdf5b1a8832c47945a8c43fad004a89baf75e7889 SHA512 91823ceb5ace665769e928e6ead5eec9cc1cccffea9230c7e97d4ca1579b45c02c4cd192f2dd7e8257de8b43bc6176b78343f9992a0cb222722abd173c2d1394
+AUX c2esp-27-missing-includes.patch 1107 BLAKE2B 36063d8bf6025e4c7df3151b3b3da868d0850bde7ed28e4c5c7c9ce604709e1acb8473cd54bce7643df710ed51ac1aad56c1a42ca24ebda791cbdfecbfb8bf9b SHA512 90dc8880864ec2aed498ebba2173c07697f8136bc95788f0e3e446fe16519857288c07c0a67c5a319c19837550e0b52e38a788419ffc85ebcbc0434edde2c0de
 DIST c2esp-27.tar.gz 143551 BLAKE2B 7cc80fd72eed24c24cb153d7395a692849c51249ca40a563f94bedbb82c6d976bce6b44d47dbe21c36ec40f26571178f562b175485f404d356724b4bc3f611bf SHA512 d3ff9dc6de7cf692e4be4f4b316f862d271bff06181f0000daf1ce2fb6921f1b24efe88ec24f7b811d78cb9dca18fcba3f17dd5273ac84ceb9f6bfcecedeecce
-DIST c2esp26.tar.gz 127593 BLAKE2B 84e6ff61fc5af225526a569861bf316a2b7b1aa8f2bf4d7af15a04042f9dd2da7726d34b66d12dea8748532a54d5ae3a1b0bbfafdccccbea192725751cf3416e SHA512 aa1ca61f895de4892e1058b349fcf1830da78455ffbd0d9989b7ac4e922076e184de91a2b79f285d946d29ece7a6d8159f62c900ed8d6c76859a4261c92da359
-EBUILD c2esp-26.ebuild 1159 BLAKE2B 81194a8775940beb806a456e1d013b7ab7d5b2373bae1c33fe373fcaddfd9a377630744b889a091e97d1a4f06cff91f4346705f2164f846a7d9a8b374e2aca8e SHA512 ef5855f0aae411da2ff6520e44cd0935ba33b524216bbab912c9474b1c1f2ea0b3acd05f5bc9f70bd3f1d16238fc022fe6d78f1cea4395da1ba5d56d803eface
-EBUILD c2esp-27.ebuild 699 BLAKE2B 0d0be951c38fd455af0b511ed0f9b4c7949b41747240794700e31288ba1846d9c89717f012ed46f5c2fa4a16cceaee255d9de7be65f5dfa7df7add78dff09606 SHA512 c8062f8f6d66fc63b44361afd0544ee42ffe45b81dcb64e153e2b78ef69594f19527bd2e900c39e05e8d344d7b481a2e40a4d6adf106ea501d2007aed58d8819
+EBUILD c2esp-27.ebuild 722 BLAKE2B 7bbb30c176e826cf170bbcb76af4d829f4489fc5627252800ff04d86323b95c09ec567880fd12d122b64b6c52f78862440d22c4360ce02132b9ad0082ed5bd55 SHA512 9f3a0cebc757ff77fcdd48ad4a5d6b88076dd411dd08bc8dd9d17a5fb2c09ab9ebe2b6fdccdbec61e8e9afaac871fe6dff88513db129b89312d98f959e576f6d
 MISC metadata.xml 354 BLAKE2B 125545bf6e8dbd21bb674f494585d22d2e293738a9409613fa91eb7d888f4d6c10028aaf3b55beab10e5f94e4cbaee34eb9fb3d8f24c9f64056b6085edf6319c SHA512 d392c1b2ed7e557c5f9ce293e4cb668e0c229ece25dfdb098f569c0cbf9f797d706a0f55a066a8c5649bbc2184866a92d169f32c1f2eaa97c6f073e6d77c57a7
diff --git a/net-print/c2esp/c2esp-26.ebuild b/net-print/c2esp/c2esp-26.ebuild
deleted file mode 100644
index 1619b47f90b3..000000000000
--- a/net-print/c2esp/c2esp-26.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}${PV}
-
-DESCRIPTION="A cups filter for Kodak ESP printers"
-HOMEPAGE="http://cupsdriverkodak.sf.net/"
-SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=media-libs/jbigkit-2.0-r1
-	>=net-print/cups-1.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags-cppflags.patch
-
-	# Remove embedded media-libs/jbigkit
-	rm -f *jbig* || die
-
-	# Remove the embedded jbig files from the Makefile's dependencies:
-	sed -i \
-		-e '/^[a-z0-9.]*:/s/\$(LIBJBG[[:digit:]]*)//g' \
-		-e '/^[a-z0-9.]*:/s/jbig[^ ]*\.h//g' \
-		-e '/\$(INSTALL).*COPYING/d' \
-		Makefile || die
-
-	# Use Gentoo-style cups paths
-	sed -i -e s,/usr/lib/cups/filter,/usr/libexec/cups/filter,g ppd/*.ppd || die
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" LIBJBG=-ljbig LIBJBG85=-ljbig85
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		FILTERBIN="${D}"/usr/libexec/cups/filter \
-		DOCDIR="${ED}"/usr/share/doc/${PF} \
-		install
-}
diff --git a/net-print/c2esp/c2esp-27.ebuild b/net-print/c2esp/c2esp-27.ebuild
index 69e58fbb92f9..f7fe2a2c6a37 100644
--- a/net-print/c2esp/c2esp-27.ebuild
+++ b/net-print/c2esp/c2esp-27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,6 +6,7 @@ EAPI=7
 DESCRIPTION="A CUPS filter for Kodak ESP printers"
 HOMEPAGE="https://sourceforge.net/projects/cupsdriverkodak"
 SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -17,7 +18,8 @@ DEPEND=">=media-libs/jbigkit-2.0-r1:=
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/0001-Fix-various-missing-includes.patch
+	"${FILESDIR}"/${P}-missing-includes.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_configure() {
diff --git a/net-print/c2esp/files/c2esp-27-fno-common.patch b/net-print/c2esp/files/c2esp-27-fno-common.patch
new file mode 100644
index 000000000000..8e4dc81519e2
--- /dev/null
+++ b/net-print/c2esp/files/c2esp-27-fno-common.patch
@@ -0,0 +1,32 @@
+Taken from: https://sources.debian.org/patches/c2esp/27-8/0002-Add-extern-stanzas-to-variable-definitions-in-header.patch/
+Author: Didier Raboud <odyx@debian.org>
+
+--- a/src/c2espcommon.c
++++ b/src/c2espcommon.c
+@@ -42,11 +42,11 @@
+  * Globals...
+  */
+ char		CallerName[50];  	/* String that identifies the calling program */
+-int		DoBack;			/* Enables the back channel comms */ 
++extern int	DoBack;			/* Enables the back channel comms */
+ char 		BackBuf[32000]; //for the back channel replies from the printer
+ int 		BackBufLen=sizeof(BackBuf)-1;
+ FILE 		*LogFile = NULL; //file descriptor for log file
+-time_t		StartTime;
++extern time_t	StartTime;
+ int		BlackPercent, ColourPercent;
+ 
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile)
+--- a/src/c2espcommon.h
++++ b/src/c2espcommon.h
+@@ -35,8 +35,8 @@
+ /*
+  * Globals...
+ */
+-char 		BackBuf[32000]; //for the back channel replies from the printer
+-int		ColourPercent, BlackPercent; //to store the detected marker levels
++extern char BackBuf[32000]; //for the back channel replies from the printer
++extern int ColourPercent, BlackPercent; //to store the detected marker levels
+ 
+ 
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile);
diff --git a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch b/net-print/c2esp/files/c2esp-27-missing-includes.patch
similarity index 100%
rename from net-print/c2esp/files/0001-Fix-various-missing-includes.patch
rename to net-print/c2esp/files/c2esp-27-missing-includes.patch
diff --git a/net-print/libgnomecups/Manifest b/net-print/libgnomecups/Manifest
index ef64cb5b09ed..f395842ff446 100644
--- a/net-print/libgnomecups/Manifest
+++ b/net-print/libgnomecups/Manifest
@@ -7,6 +7,5 @@ AUX libgnomecups-0.2.3-glib.h.patch 1017 BLAKE2B 1b3ffe7417f1fdfa617a214162efcd0
 AUX libgnomecups-0.2.3-lpoptions.patch 408 BLAKE2B 970583a14c8850d1e65feab9459a11f8b72e72d6d6aebabe6fac188158128a2e5c17cc1322e223bdf1757852b1b5b8d6996764bc87d9bb2412c782d1b9f9ffb8 SHA512 6d64b0b14dcce03a36a1c0b257e19c37e93778552f306ee312b019690fc35b64b0f1f5c1dc54c72ee85dad755b1facb607d5ef7914c6af01c4bcb86ad4628c85
 AUX libgnomecups-0.2.3-pkgconfig.patch 404 BLAKE2B 78c0107172cf057975dcc4f4c938c2ae990b022d1afaf87e7b0d8623987148d5d240970311fbea0a8c23734d1130bde4c8a05a094e17c8102bcb26f90a43d714 SHA512 2a3ea4921c01c01a55266deaf36d9ff2b0511592be1e58add93af398b9d0d92b21d8c3fe62446b09a939b46569997381a8e56435797625758a22b7d52914c3f8
 DIST libgnomecups-0.2.3.tar.bz2 357129 BLAKE2B 8a8babf0af7a83232590c5e756c4e1c2ce329dae59b88ee5be84c0286a6ed6d6c39f891b7ab0bb68bfc29539769cdd82032422c44a6131c4da9c9355669b1a57 SHA512 7276dfc92209c8503d8a59ceb192273e41bc13cc5f3515dcc00444deca4b9de6a29d0ec4c89811398e03971fa3f5ccbb85ca477da6c5f2bc26f2fb70dccb6a75
-EBUILD libgnomecups-0.2.3-r3.ebuild 1098 BLAKE2B e5000f33856cbf38ad2e3d013eaef941ee98c5fee6c71edd2e326c6ca1cc31000d4908c2a252c3753a56ebf3f541ce7d3dd868bd8c4b7e83b2e9ffdb44ec1174 SHA512 a89b9caee65d3abdab0edccdd731a7eec1dc6912f8f78b69c1798ece19240bf13a1014870c864d7f53258473c46a1b5afe5c8bf69b3287f2fdc4ae0ff0d8c557
 EBUILD libgnomecups-0.2.3-r5.ebuild 1615 BLAKE2B a27892b403cdb58616e70c7f8a0f508fd91c4867a17706e66bb2e401cfbfa61c3a42a108e324ab987a3a9b6d74623014bc63ee5c056ef100b7f07d5d51680e00 SHA512 863530b21f8dd7eb1ef3b590ff399cec9b9deeb994597db2dfe3519a7f975e3f7d3b0c09771e2a3eb06779192a9809b4fbe447e51f79a1ddbdaea31365aea38b
 MISC metadata.xml 365 BLAKE2B a34fd100f946a0e9b31486a7fbf620e8b63495fbd2a24ac665435526bf980e23715a2b9b1b24b7e114e23c4f86c1a3c144c1d92e034464bb26b051ff39bfd53b SHA512 6696e110749820558c770f257f4f74d8d4a6fb617e9f74b7170e12a6c353a03a4fbfbc1c39f2247657f515079d541752da8f6f993d37464523ae5364f0e7c6e9
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
deleted file mode 100644
index bf943d4fba6d..000000000000
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="GNOME cups library"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2:2
-	>=net-print/cups-1.3.8
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.28
-	gnome-base/gnome-common
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/enablenet.patch
-
-	# Fix .pc file per bug #235013
-	epatch "${FILESDIR}"/${P}-pkgconfig.patch
-
-	# Upstream fix for g_list_find_custom() argument order
-	epatch "${FILESDIR}/${P}-g_list_find_custom.patch"
-
-	# >=glib-2.31 compat, bug #400789, https://bugzilla.gnome.org/show_bug.cgi?id=664930
-	epatch "${FILESDIR}/${P}-glib.h.patch"
-
-	# cups-1.6 compat, bug #428812
-	epatch "${FILESDIR}/${P}-cups-1.6.patch"
-
-	eautoreconf # To fix intltool files making LINGUAS to be honored
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index de3978ceec5a..2c8759623bba 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index c47ed9ffde02..3b6755d45f7d 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -33,7 +33,7 @@ EBUILD haproxy-2.1.9999.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca1
 EBUILD haproxy-2.2.0.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca177eb5d2304ddfeece9af1f7e36463f535f8c00341aa604f6ef2bcdbf0772b5b19a0eb87d247244428e15b0c41f17 SHA512 f07a595c679fe8db7a6f8cf63cf30c95851430e50f1289ca3a6589ef52ad817bd6d2f9d6a44f6e382c2e3a7c6c122e7cb76a79b95dd4dbc0206c0c33afabc0cd
 EBUILD haproxy-2.2.3.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca177eb5d2304ddfeece9af1f7e36463f535f8c00341aa604f6ef2bcdbf0772b5b19a0eb87d247244428e15b0c41f17 SHA512 f07a595c679fe8db7a6f8cf63cf30c95851430e50f1289ca3a6589ef52ad817bd6d2f9d6a44f6e382c2e3a7c6c122e7cb76a79b95dd4dbc0206c0c33afabc0cd
 EBUILD haproxy-2.2.4.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca177eb5d2304ddfeece9af1f7e36463f535f8c00341aa604f6ef2bcdbf0772b5b19a0eb87d247244428e15b0c41f17 SHA512 f07a595c679fe8db7a6f8cf63cf30c95851430e50f1289ca3a6589ef52ad817bd6d2f9d6a44f6e382c2e3a7c6c122e7cb76a79b95dd4dbc0206c0c33afabc0cd
-EBUILD haproxy-2.2.5.ebuild 5405 BLAKE2B ee8d5160986d486cc72495373af5f74a791a793355b7a219c302db68e87b8d43189648bb22374277c1ce116b1dbe9b6ae7e03b6fe5bba750271a868bd7b85a86 SHA512 868749f539a4c81ff0965a9a7db6d11c8bc0e1c2447f5fdc05844b4bcfae444434f0ef95e87a7b255c4805a3b19eddc100859561e4d3a1e671a6ac3a21b8958b
+EBUILD haproxy-2.2.5.ebuild 5403 BLAKE2B d86c9e266cd9c93a101df63c3ee315fdc5338819f735a7bdb515a9d080b0c72d5775020735a1ad5a565d8fc45b8dd405d479aee87c3b94e5443c704b019d8703 SHA512 94c58695fe9da7f64c3c7abf319c01cc74033aad667c975f026b74e7c1a2102722c26eac68584759b241af9fc59d36f17edf2a418328b04bee36c23cb288a09c
 EBUILD haproxy-2.2.9999.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca177eb5d2304ddfeece9af1f7e36463f535f8c00341aa604f6ef2bcdbf0772b5b19a0eb87d247244428e15b0c41f17 SHA512 f07a595c679fe8db7a6f8cf63cf30c95851430e50f1289ca3a6589ef52ad817bd6d2f9d6a44f6e382c2e3a7c6c122e7cb76a79b95dd4dbc0206c0c33afabc0cd
 EBUILD haproxy-2.3.1.ebuild 5308 BLAKE2B 7ae680f08d10550ba8b8411b900ee9868e9c84655673c6717f5219680f007759cccd6b5c26093b41767aa0c112d3a2b294d94e69119b7f70598e4ff4096e806e SHA512 a734b8dc6e6843922dfb620e1ce73b80f25cedde8b594ae9a6fcb7c0371cf8500614985cf18fe0e3413837752d8922076fb3791319a96c021470b9b6f1678efd
 EBUILD haproxy-2.3.9999.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca177eb5d2304ddfeece9af1f7e36463f535f8c00341aa604f6ef2bcdbf0772b5b19a0eb87d247244428e15b0c41f17 SHA512 f07a595c679fe8db7a6f8cf63cf30c95851430e50f1289ca3a6589ef52ad817bd6d2f9d6a44f6e382c2e3a7c6c122e7cb76a79b95dd4dbc0206c0c33afabc0cd
diff --git a/net-proxy/haproxy/haproxy-2.2.5.ebuild b/net-proxy/haproxy/haproxy-2.2.5.ebuild
index 7e20699eb121..b27af8aada93 100644
--- a/net-proxy/haproxy/haproxy-2.2.5.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://www.haproxy.org"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc x86"
+	KEYWORDS="amd64 ~arm ppc x86"
 else
 	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
 	EGIT_BRANCH=master
diff --git a/net-proxy/nutcracker/Manifest b/net-proxy/nutcracker/Manifest
index 8d8ddc3f3d68..c3c44fb676c0 100644
--- a/net-proxy/nutcracker/Manifest
+++ b/net-proxy/nutcracker/Manifest
@@ -4,10 +4,6 @@ AUX nutcracker.confd 271 BLAKE2B 5f8a19edd4841cbc8b86f14ec48b72a46be95f34050619a
 AUX nutcracker.confd.2 272 BLAKE2B dfcfdfb4134ce0acfb126b1c7cb32062e47906dd68ed109a4e9edbae9c56f4b1ae17b20f593ef5af904bbe85837f5bb9ff91e0e068acfdff82e949b623abb55a SHA512 d208654b1e1fd20f456f340fabe25836c8ba948c96db8034d41710f9e0362936a24f0faec89e51c04d478c60de5255c9d238ab00d7d7b778a0619061a8cbce4c
 AUX nutcracker.initd 890 BLAKE2B a06886319400baa7b38fc32fb2961c80def5298e733977317edc158eef265d913b1437427b47e383f4c8ce0e65cf3d2d5117865ed542fc1ecc0a1f964356b7b8 SHA512 f40d692daa3cad7d7bce85ac0ecb01ca93f28f79e74b8a5bbea38930f78b24578b47fd7c44e36217ce60fee1ac3faefd8cd6d923046b339ec00c8fcc0f05f4fb
 AUX nutcracker.initd.2 891 BLAKE2B c643a511d2e402477c0862b67cdebb244fc2205466d78bc3cdb74b1f63b1659fef6bc0480d6950b5e00c0d9e84e072050f3bedb5d7931ee904c233313290e20b SHA512 ab06f875dca4ae27b4536d84c9342ec362e6f45f20efd370da0cb6073b306eeb0a1166737f6bdba3e1d5fe836d6b708729b7eadbab62cf66151649d2f56414eb
-DIST nutcracker-0.2.4.tar.gz 1723439 BLAKE2B 58287d9dfa51f6661fd1f288308c2172856dc284053e211df83f142d1314b89869b5eccb95412b71dc385726eb4a878cec0e2e9a79d5f2850214dab154c437b4 SHA512 13d7d2a778a5d85a1d73eaa220f2e95eb7765eff0c8af390ab916f099b12d6c1a99cb61ff418b9a909ff7e2b416b271ba034eb9f50cd7df1ee53600d8b681409
-DIST nutcracker-0.3.0.tar.gz 1825106 BLAKE2B e98a7a4a8d6599b14bdd21204cd0d1894d4474f32a2a9184d991217e6c087a504f51d8b822a0ad687b35c9119a63d5d338e6df4137f059784efd05c3b512aa65 SHA512 81ba21c54b9a15fbb1d0a42b426643b65bcd20b7bb4b35cf3427235703a01a44188b762edff412afe20c193a4e75bf618f69d8c77bae9d66cd2c4e619416f565
 DIST nutcracker-0.4.1.tar.gz 1163442 BLAKE2B 6838fbb5623ad49ef564176ba4c7d4e61cedb9693851cacc06d8ed09e3045b8cff9df1af8e21790cfa0e3f988b81a9c9cfa852449d532a432c05f3f4c3eace56 SHA512 581fae1d12feb983ed25b22cd6f597fd28b7070906ac29d3990669ae5c626a468914021cee152a6a2299a2838c838ad907e4c911b911ef04166ac7bbb2982da1
-EBUILD nutcracker-0.2.4.ebuild 879 BLAKE2B a4b7aa9527bc78e5362c7b6da396c2589167e3d1c2268263c72ea7163b07b70869e79a44282ab7491eb83546856fd979a59b6b1cc5d0d51a205b2fce4665b7fa SHA512 ce16532d9984d34b6b62e114d32938a7afe350b3b67bbbf1db23b8a1f51d2f5576e7a84a11f86f325a56026d2436609e1cfa532eae979f8d48952b7a3c6ad9f9
-EBUILD nutcracker-0.3.0.ebuild 879 BLAKE2B bce999e160912b0235e387045048fe93fcb7d757128bce065b64ae39094a99af16a4319beef4e68caac96bf279c305deab1c7f94a46b5b673091471e109e386b SHA512 f6bf0c8bbf6c0564d8f91fc06236da22e4c9938cc4c88ca79f622eb303857cef5575e8fe176d4bf4a841a2949d6692c5515806ea365a3243b72cad1da8b89c41
 EBUILD nutcracker-0.4.1-r1.ebuild 945 BLAKE2B 035e4388a33b31aca64ff31265b2ca9b7009bed0c63b621cf5d6002f08643ef0e44d3870755c66ec416e1bff3ed2dc4acd928b470ae9dab7e52a7308bb87d412 SHA512 5253d7d16427ad5f25650a741aa835b8130f632df98be16b92a9ae52f5d81da620cf578752e39ef42ff080188ba203b57dd922de9ddf53332d7e3ffca85ce3f8
 MISC metadata.xml 329 BLAKE2B c3b117fab3b6d2d5f01572e797c946d89bfead4d46853df0aa03da840fde527fbaec9d070446872aabd632a3a27f2a0ad82a4164df0c58fa132a8b51e38828ea SHA512 26a39f6d3e84b5ec4f59c9f7167593f3f340be020401213a0339d027ddcbbcebbb512313c39ed1a3e61007b16f85737dc23e2f091413a4ef91d3675fd2ea2034
diff --git a/net-proxy/nutcracker/nutcracker-0.2.4.ebuild b/net-proxy/nutcracker/nutcracker-0.2.4.ebuild
deleted file mode 100644
index fa6a1948951b..000000000000
--- a/net-proxy/nutcracker/nutcracker-0.2.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A fast, light-weight proxy for Memcached and Redis.
-(Twitter's Twemproxy)"
-HOMEPAGE="https://github.com/twitter/twemproxy"
-SRC_URI="https://twemproxy.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
-
-DEPEND=">=dev-libs/libyaml-0.1.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Lets use system libyaml
-	epatch "${FILESDIR}/${P}-use-system-libyaml.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use debug)
-}
-
-src_install() {
-	default_src_install
-
-	insinto /etc/nutcracker
-	newins conf/nutcracker.yml nutcracker.yml.example
-
-	newconfd "${FILESDIR}/nutcracker.confd" nutcracker
-	newinitd "${FILESDIR}/nutcracker.initd" nutcracker
-
-	if use doc; then
-		dodoc -r notes
-	fi
-}
diff --git a/net-proxy/nutcracker/nutcracker-0.3.0.ebuild b/net-proxy/nutcracker/nutcracker-0.3.0.ebuild
deleted file mode 100644
index bd06f918d24a..000000000000
--- a/net-proxy/nutcracker/nutcracker-0.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A fast, light-weight proxy for Memcached and Redis.
-(Twitter's Twemproxy)"
-HOMEPAGE="https://github.com/twitter/twemproxy"
-SRC_URI="https://twemproxy.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
-
-DEPEND=">=dev-libs/libyaml-0.1.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Lets use system libyaml
-	epatch "${FILESDIR}/${P}-use-system-libyaml.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use debug)
-}
-
-src_install() {
-	default_src_install
-
-	insinto /etc/nutcracker
-	newins conf/nutcracker.yml nutcracker.yml.example
-
-	newconfd "${FILESDIR}/nutcracker.confd" nutcracker
-	newinitd "${FILESDIR}/nutcracker.initd" nutcracker
-
-	if use doc; then
-		dodoc -r notes
-	fi
-}
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index 5d50b9b51b26..3cef5b7d318d 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -1,6 +1,7 @@
+AUX ziproxy-3.3.1-fno-common.patch 734 BLAKE2B d8561e70258b1830273d8da685acf543d843ae362fde7463bb1eacfcb997be7b3332b21470583453a8e627b411b83572ea67b1ad496b0c541fcdea4db3381841 SHA512 fdc00b0e14a3eea309943dcc8adaa6281c581b65956e41cb70a913ae82d58a5a42502986894ae8c8e1e9f791a82985dcf879cf63dbca67f6c642559d60755f1a
 AUX ziproxy-3.3.1-giflib5.patch 1399 BLAKE2B d8f60518ae1b1fe777597d5dcc56816aee1ea3a05010a3fe39bc432834aa66f6d4b439536567a2840f05ee8cddfdecb9c3da2e9299fad4aea9163ce984c4cc4d SHA512 d8ab2e6d89fdfb7fa7e86905e9525cff6704a57ef4c25a83eb64fde39769c0196472645eaccdaa7363338cecd18855151ff82995887391e6d428227d0a516a6e
 AUX ziproxy.confd 650 BLAKE2B 1c9dacf16234404fc702643ffd9fc2c72d7c7eb3e1d17af68a7c784a650bc7e95688167b86fc57e0b25b09c984569de52b3ef214be34b416642f9f1be4b02e0b SHA512 77d730705c652c59acbd20c10d06801427cc3736ef3f9e06771fcadb0470599b3f6b84bd6e4d35c10e90927077e35e0547051b638a4bbafe4a596c38aa1af0eb
 AUX ziproxy.initd-r1 558 BLAKE2B 3a6ccb81024c594babb288375d7b1c47208214700d9a362bc2eae1064f3ff026559f52dcccb3774924faa36a1f66d177347615ea6eab873ddccdac6ecd65a5c6 SHA512 81fd2c24876e6cc2be6c1b77e9c3ff916a7a8b541655aeb0dab3122c7b40a5f23ddc7db3d3867441c3f61509e0c75e321681e7fcd4e6b268f45faab55460542f
 DIST ziproxy-3.3.1.tar.xz 205972 BLAKE2B 60dde7a7da61408023d85c92b04e22e876155e90ad5541653748d7e9059a47e698767420b3f3bc072d2b23aa99b0bf0f7335965fcd519b7f34eeddc0849fb000 SHA512 bff87a63320e721091ccdcdbe409f59db7f7f681ee8b7f093f18f3c0391579a25b9a8daf6ccfea4d94384142247ce36cfaec68d294b2a23caa56ede436da2d87
-EBUILD ziproxy-3.3.1-r1.ebuild 1612 BLAKE2B 109f51906fc16c5d4f87ad609feb27da35f7e162fc47ca4ab8e1717064d5b74fef161668ad2650be4f8a522eb468b25800e564f51e31eb850a6444076b6c5d7b SHA512 f6f2b8bdda748afefbc65ddb426e478aef2936b4244a9c77ce0a3d9bf1e4bf05bb88244b9159059fa77ef1e80e2ea6095f7866b558d9578eda2cc26f7e5de256
+EBUILD ziproxy-3.3.1-r2.ebuild 1607 BLAKE2B d7c800604f2d4092bd2717557dc1a0b24e75642e244da469e048e1931ac2f681191c0ad8a2e0fb76fd9d0cfb183fa782e075bfebc6854701c401262c67729a48 SHA512 95ce2d1f064cc491ac40410e2c074577767033d066ac8a1f49bac0aea022b348ab8b4550627ebd4e1c09aa3d9ef83540c08c9855be469d4a9a765552e456df21
 MISC metadata.xml 516 BLAKE2B a85e057b74ce76cadded707fbd9bbb810f5f3fe4ac5b30ccda9b02fc22efedcffe3c2eb398f36a986d067771290de88fb5aa0f42cdc9846fc869d9de3a105d41 SHA512 477983c8d8f5e65f6bb6f8462711e6920da429c4c17dbcabfe5743da8cd693d016df2743bc4cedf042ccbe2d2f406486173ce7e118a117634eb3c2fee7cf4e6f
diff --git a/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch b/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch
new file mode 100644
index 000000000000..5b6735c5d885
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch
@@ -0,0 +1,19 @@
+--- a/src/tosmarking.c      2020-05-21 14:56:31.095000000 +0900
++++ b/src/tosmarking.c      2020-05-21 14:58:11.720000000 +0900
+@@ -36,11 +36,11 @@
+ /* private, local. those are not the same as the vars with the same name */
+ int tosmarking_enabled;
+ SOCKET sock_child_out;
+-int TOSFlagsDefault;
+-int TOSFlagsDiff;
+-const t_ut_urltable *tos_markasdiff_url;
+-const t_ct_cttable *tos_maskasdiff_ct;
+-ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT;
++extern int TOSFlagsDefault;
++extern int TOSFlagsDiff;
++extern const t_ut_urltable *tos_markasdiff_url;
++extern const t_ct_cttable *tos_maskasdiff_ct;
++extern ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT;
+
+ int current_tos;
+ ZP_DATASIZE_TYPE tos_bytecount;        /* counter used by TOSMarkAsDiffSizeBT */
diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
similarity index 86%
rename from net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
rename to net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
index b5d92bd3fadc..ee73d8bdc662 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit user
+EAPI=7
 
 DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
 HOMEPAGE="http://ziproxy.sourceforge.net/"
@@ -14,6 +13,8 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="sasl xinetd"
 
 RDEPEND="
+	acct-group/ziproxy
+	acct-user/ziproxy
 	media-libs/giflib:0=
 	media-libs/libpng:0=
 	virtual/jpeg:0
@@ -23,12 +24,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-giflib5.patch )
-
-pkg_setup() {
-	enewgroup ziproxy
-	enewuser ziproxy -1 -1 -1 ziproxy
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-giflib5.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
 	default
@@ -58,7 +57,7 @@ src_install() {
 	default
 
 	dodir /usr/sbin
-	mv -vf "${D}"usr/{,s}bin/ziproxy || die
+	mv -vf "${ED}"/usr/{,s}bin/ziproxy || die
 
 	dobin src/tools/ziproxy_genhtml_stats.sh
 
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index bff2967a47f8..3985ae49cf27 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/vtun/Manifest b/net-vpn/vtun/Manifest
index 77018729fce7..367459d3ac46 100644
--- a/net-vpn/vtun/Manifest
+++ b/net-vpn/vtun/Manifest
@@ -6,5 +6,4 @@ AUX vtun.rc 669 BLAKE2B beb4f78d4a4c8a83ea7d102a9c508125cf0942081aebeb0d6196fa8a
 AUX vtund-start.conf 1174 BLAKE2B 3bce3aa808286c554accb71876314bbe8ecbd5e02b16b804f911201a0fbfd8fae25f9f6a702d2de4ef5254d50661d9d1c578f5d6b7e9dcec5b92ebe8b4724007 SHA512 7ec2a8f64380483b8e311bbefb78675a457e27088888e654f8c5fee5f14a77a72f1319b9c7e2dd38763c86728e4f44d6eb87c286103e547e19f329f1550e6710
 DIST vtun-3.0.3.tar.gz 130051 BLAKE2B 9bbc11724fb75acd024fda8b4e84af425c5377b3d8a938f7e789ecb1c2cdb95f109a1edc59f3fcbd2c5898bd17be76054060e8e36a1fb4355b40b61cc64adaad SHA512 5fa789d08b556f97492b89515a89c2322c4b0a8fa95bd1035f5ed19061b3654a6a36a9911792096ac872ae9ae5451848cab87d0343dc0ffc064affea1f7d0d54
 EBUILD vtun-3.0.3-r1.ebuild 1533 BLAKE2B 0b6c7af0263cff3121b6cd14eba8c6da85adc352b6c388d9502177bd09e1ec3b35e22a74215b4f8283ba4fe3b7d99786d2f5378279a8fec82dc93e126f88b021 SHA512 b1d101ca8513f18e2fc114657518f6e866eaec6934f689593116c0941ac6e94daf373e880a6666b05b9720dcb9ec387504bd836f27e9de4a33c8c2b912363df7
-EBUILD vtun-3.0.3.ebuild 1450 BLAKE2B 50212549f2a46310ca4cd7160d65a6efaf1a5648a6005c0783821c3be15f459d5a77d377815b2a53df3447f44482e1746acdaac4fea2dbdb992b695fe93c3285 SHA512 cfee3847a8925c5d37b6273896e759fc8cbd49302c31870d6124fe51d70b91d1d9414453c99345b09c6a308b6cde9151e8426d6524358d0ebb962b45260173a1
 MISC metadata.xml 321 BLAKE2B bc9b56ffe1106a5ba954a206111d3814e33cca82f2431c888f7c5da8c7b8314e3fcda78c6f96791cc33b6710ff8eb07ba38c14582e2f5a070ae10442d0ea03d0 SHA512 c5983cd105c9b0534371fae20648dc22d4d73440d2f1df3fdab3c84dc76d58fc951c31421cf9ac597fdef0067a53fcb54817a4a0c40b6cbf8c4dcfae8543c731
diff --git a/net-vpn/vtun/vtun-3.0.3.ebuild b/net-vpn/vtun/vtun-3.0.3.ebuild
deleted file mode 100644
index 153cff659a9f..000000000000
--- a/net-vpn/vtun/vtun-3.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info
-
-DESCRIPTION="Create tunnels over TCP/IP networks with shaping, encryption, and compression"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://vtun.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE="lzo socks5 ssl zlib"
-
-RDEPEND="ssl? ( dev-libs/openssl:0 )
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( sys-libs/zlib )
-	socks5? ( net-proxy/dante )"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-DOCS="ChangeLog Credits FAQ README README.Setup README.Shaper TODO"
-
-CONFIG_CHECK="~TUN"
-
-src_prepare() {
-	sed -i Makefile.in \
-		-e '/^LDFLAGS/s|=|+=|g' \
-		|| die "sed Makefile"
-	epatch "${FILESDIR}"/${P}-includes.patch
-	# remove unneeded checking for /etc/vtund.conf
-	epatch "${FILESDIR}"/${PN}-3.0.2-remove-config-presence-check.patch
-	# GCC 5 compatibility, patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778164
-	epatch "${FILESDIR}"/${P}-gcc5.patch
-	# portage takes care about striping binaries itself
-	sed -i 's:$(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund::' Makefile.in || die
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		$(use_enable ssl) \
-		$(use_enable zlib) \
-		$(use_enable lzo) \
-		$(use_enable socks5 socks) \
-		--enable-shaper
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/vtun.rc vtun
-	insinto etc
-	doins "${FILESDIR}"/vtund-start.conf
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 79c7f18e39ab..e5ba91c8187e 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm/armv4/package.mask b/profiles/arch/arm/armv4/package.mask
index 33913c4d3e11..a156d9bd912d 100644
--- a/profiles/arch/arm/armv4/package.mask
+++ b/profiles/arch/arm/armv4/package.mask
@@ -14,3 +14,4 @@ virtual/rust
 >=sys-auth/polkit-0.118
 >=dev-libs/gjs-1.66
 >=gnome-base/gnome-shell-3.38
+>=x11-themes/adwaita-icon-theme-3.36
diff --git a/profiles/arch/arm/armv4t/package.mask b/profiles/arch/arm/armv4t/package.mask
index 33913c4d3e11..a156d9bd912d 100644
--- a/profiles/arch/arm/armv4t/package.mask
+++ b/profiles/arch/arm/armv4t/package.mask
@@ -14,3 +14,4 @@ virtual/rust
 >=sys-auth/polkit-0.118
 >=dev-libs/gjs-1.66
 >=gnome-base/gnome-shell-3.38
+>=x11-themes/adwaita-icon-theme-3.36
diff --git a/profiles/arch/arm/armv5te/package.mask b/profiles/arch/arm/armv5te/package.mask
index acfca389f0c8..c8f6ea7d4bf9 100644
--- a/profiles/arch/arm/armv5te/package.mask
+++ b/profiles/arch/arm/armv5te/package.mask
@@ -14,3 +14,4 @@ virtual/rust
 >=sys-auth/polkit-0.118
 >=dev-libs/gjs-1.66
 >=gnome-base/gnome-shell-3.38
+>=x11-themes/adwaita-icon-theme-3.36
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 809a40418d95..fc79664a2729 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -294,12 +294,6 @@ net-vpn/strongswan strongswan_plugins_unbound
 app-i18n/anthy canna-2ch
 app-i18n/scim-anthy kasumi
 
-# Gilles Dartiguelongue <eva@gentoo.org> (2014-12-23)
-# New dependencies for wayland support in Gnome 3.14
-# See bug #533420.
-media-libs/clutter egl wayland
-media-libs/clutter-gtk wayland
-
 # Markus Meier <maekke@gentoo.org> (2014-11-29)
 # Unkeyworded deps, bug #518742
 dev-python/ipython doc
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index a2a8d72d8052..18a351b00c5a 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -24,10 +24,7 @@ net-misc/unison gtk
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-11-02)
 # media-video/pipewire is not stable yet
-dev-libs/weston pipewire
-<kde-apps/krfb-20.07.80 wayland
-<sys-apps/xdg-desktop-portal-1.7.2 screencast
-x11-wm/mutter screencast
+<dev-libs/weston-9 pipewire
 
 # Michał Górny <mgorny@gentoo.org> (2019-09-08)
 # virtual/jdk is not stable here.
diff --git a/profiles/package.mask b/profiles/package.mask
index 12e917f0d2f7..83b1ae122dc5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,11 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert <soap@gentoo.org> (2020-11-28)
+# Last release in 2002, multiple open bugs, no maintainer, no revdeps.
+# Bug #709512, #713300, #729518, Removal in 30 days.
+app-text/cook
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-11-25)
 # KF5 PortingAids (from kdelibs4) without any remaining revdeps. Bug #755956
 # Masked for removal in 30 days.
@@ -190,11 +195,6 @@ app-text/kchmviewer
 # Bugs #712200 and 725388. Removal in 30 days.
 sci-misc/mendeleydesktop
 
-# Joonas Niilola <juippis@gentoo.org> (2020-11-18)
-# Doesn't compile, no maintainer, our package is multiple versions
-# behind from upstream. Removal in ~30 days. Bug: #739212
-games-emulation/ppsspp
-
 # Michał Górny <mgorny@gentoo.org> (2020-11-18)
 # Upstream has switched to aiobotocore.  It's a huge hack that requires
 # a very specific botocore version, currently 3 months old.  Given that
@@ -482,11 +482,6 @@ gnome-base/orbit
 # Removal in 30 days.  Bug #635592.
 games-strategy/asc
 
-# Maciej Mrozowski <reavertm@gentoo.org> (2020-10-23)
-# Crashes at startup - bug #750770, dead upstream - bug #737936
-# Removal in 30 days.
-~net-im/kadu-4.3
-
 # David Seifert <soap@gentoo.org> (2020-10-21)
 # No releases in over 3 years, no more revdeps in tree
 # upstream mostly unresponsive to requests for proper
@@ -504,6 +499,9 @@ dev-lua/luacrypto
 # All these ebuilds require slotted Lua, which is still masked.
 # Ulrich Müller <ulm@gentoo.org> (2020-11-06)
 # Added sci-visualization/gnuplot.
+# Robin H. Johnson <robbat2@gentoo.org> (2020-11-28)
+# Added dev-lua/lpeg
+# Added dev-lua/lgi
 >=app-admin/conky-1.11.4
 >=app-benchmarks/sysbench-1.0.20-r100
 >=app-benchmarks/wrk-4.1.0-r100
@@ -511,18 +509,35 @@ dev-lua/luacrypto
 >=app-misc/worker-3.8.3-r100
 =dev-games/openscenegraph-openmw-3.4_p20200425-r100
 =dev-libs/efl-1.25.1-r10
+>=dev-lua/busted-2.0.0-r100
+>=dev-lua/dkjson-2.5-r100
+>=dev-lua/ldoc-1.4.6-r100
+>=dev-lua/lpeg-1.0.2-r100
+>=dev-lua/lua-argparse-0.6.0-r100
 >=dev-lua/lua-bit32-5.3.5-r100
+>=dev-lua/lua-utf8-0.1.3-r100
 >=dev-lua/lua-zlib-1.2-r100
+>=dev-lua/LuaBitOp-1.0.2-r100
+>=dev-lua/luacheck-0.23.0-r100
 >=dev-lua/luadbi-0.7.2-r100
 >=dev-lua/luaevent-0.4.6-r100
 =dev-lua/luaexpat-1.3.0-r100
 =dev-lua/luaexpat-1.3.3-r100
+>=dev-lua/lua_cliargs-3.0_p2-r100
+>=dev-lua/lua-term-0.7-r100
 >=dev-lua/luafilesystem-1.8.0-r100
+>=dev-lua/luajson-1.3.4
 >=dev-lua/luasec-0.9-r100
 >=dev-lua/luasocket-3.0_rc1_p20200328-r100
+>=dev-lua/luassert-1.8.0-r100
+>=dev-lua/luasystem-0.2.1_p0-r100
 >=dev-lua/lutok-0.4-r10
 >=dev-lua/luv-1.32.0.0-r100
+>=dev-lua/mediator_lua-1.1.2_p0-r100
 >=dev-lua/messagepack-0.3.2-r100
+>=dev-lua/mpack-1.0.4-r100
+>=dev-lua/penlight-1.9.2-r100
+>=dev-lua/say-1.3_p1-r100
 >=dev-lua/toluapp-1.0.93_p20190513-r100
 >=dev-util/geany-plugins-1.37-r100
 =games-action/minetest-5.3.0-r100
@@ -540,6 +555,8 @@ dev-lua/luacrypto
 >=www-apache/mod_security-2.9.3-r100
 >=www-client/elinks-0.13.5-r100
 >=www-servers/lighttpd-1.4.55-r100
+>=dev-lua/lpeg-1.0.2-r100
+>=dev-lua/lgi-0.9.2-r100
 
 # Andrew Savchenko <bircoph@gentoo.org> (2020-10-11)
 # Mask old openafs version and corresponding openafs-kernel with
diff --git a/profiles/prefix/darwin/macos/10.15/package.accept_keywords b/profiles/prefix/darwin/macos/10.15/package.accept_keywords
new file mode 100644
index 000000000000..268e7873bb54
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/package.accept_keywords
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# this is the only version known to compile on macOS Catalina
+=app-shells/bash-5.1_rc3 **
+=sys-libs/readline-8.1_rc3 **
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
index e1ce7a0144a6..90c1048e4022 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -10,3 +10,6 @@ sys-devel/binutils-apple
 
 # packages which link to framework and therefore fail (blocks)
 dev-util/pkgconfig
+
+# cmake-3.19.1 works for us
+->=dev-util/cmake-3.14
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.use.mask b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.use.mask
new file mode 100644
index 000000000000..a6f14621678f
--- /dev/null
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Cocoa integration requires frameworks, and this is a bridge too far
+# for current FSF GCC
+x11-libs/cairo aqua
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 352b31b003e8..cf34042d42c7 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2760,9 +2760,6 @@ dev-tex/abntex:lyx - Install with app-office/lyx layout
 dev-tex/biblatex:biber - Install the unicode compatible backend processor
 dev-tex/pythontex:highlighting - Syntax highlighting using dev-python/pygments
 dev-texlive/texlive-basic:luajittex - Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.
-dev-util/android-ndk:legacy-toolchains - Install legacy toolchains
-dev-util/android-ndk:target-32 - Support for 32-bit targets
-dev-util/android-ndk:target-64 - Support for 64-bit targets
 dev-util/android-studio:custom-jdk - Install and use Android Studio's custom JRE.
 dev-util/anjuta:devhelp - Enable devhelp integration
 dev-util/anjuta:glade - Build glade plugin for anjuta
@@ -3092,7 +3089,6 @@ games-emulation/pcsxr:archive - Support compressed files (via libarchive)
 games-emulation/pcsxr:ccdda - Support compressed CDDA (requires ffmpeg)
 games-emulation/pcsxr:cdio - Use libcdio for CD support
 games-emulation/pcsxr:sdl - Use SDL sound backend (other parts of SDL are used unconditionally)
-games-emulation/ppsspp:headless - Build headless version of the PPSSPP
 games-emulation/ppsspp:system-ffmpeg - Use the system-wide media-video/ffmpeg instead of bundled
 games-emulation/snes9x:libretro - Build libretro port
 games-emulation/snes9x:netplay - Enable playing ROMs over the network (not recommended)
@@ -5745,11 +5741,6 @@ net-im/gajim:spell - Spellchecking of composed messages
 net-im/gajim:upnp - Ability to request your router to forward port for file transfer
 net-im/gajim:webp - Support WebP avatars
 net-im/gitter-bin:pax_kernel - Triggers a paxmarking of the binary
-net-im/kadu:gadu - Enables Gadu communication protocol
-net-im/kadu:mpd - Enables Music Player Daemon support
-net-im/kadu:otr - Enable char encryption via OTR library
-net-im/kadu:sdk - Install Kadu SDK (cmake module, API headers)
-net-im/kadu:speech - Enables speech module
 net-im/libcommuni:qml - Install optional qml files.
 net-im/libcommuni:uchardet - Use app-i18n/uchardet, which is upstreams default, instead of dev-libs/icu, which makes impossible to run tests.
 net-im/mcabber:aspell - Adds support for app-text/aspell spell checker.
@@ -8951,7 +8942,6 @@ x11-wm/enlightenment:xwayland - Enable XWayland application support
 x11-wm/fluxbox:slit - Enables the Fluxbox slit (or dock)
 x11-wm/fluxbox:systray - Enables the system tray in the Fluxbox toolbar
 x11-wm/fluxbox:toolbar - Enables the Fluxbox toolbar
-x11-wm/fvwm:gtk2-perl - Enable GTK2 Perl bindings
 x11-wm/fvwm:lock - Enable screen locking
 x11-wm/fvwm:netpbm - Enable NetPBM support (used by FvwmScript-ScreenDump)
 x11-wm/fvwm:rplay - Enable rplay support
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index d44a604b5bc7..1acad8ce6ce6 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/hcalc/Manifest b/sci-calculators/hcalc/Manifest
index 5f80dbe7c938..ea9f2bf97c37 100644
--- a/sci-calculators/hcalc/Manifest
+++ b/sci-calculators/hcalc/Manifest
@@ -1,3 +1,4 @@
+AUX hcalc-1.2-fno-common.patch 213 BLAKE2B 0800a555e6e4938a0b45e8231c43598814d9c0d427f8a508904a6b6811481063c74222558738820785eab9f81e314fe0e65a6ac881c1a32d9cba20e945b2252e SHA512 3dfa05c69df04c887931614367cc6a7e978ed57ad4ea1ddef897d9b7e71d271c763d7fea64291be3f06d1bf9e0b003c0ec09757c221d5ce71f479f6aa3e0df20
 DIST hcalc-1.2.tar.xz 15456 BLAKE2B 0423d9e208eb804289f20ebe2011620adc35eb926645934d5a46141ce250831234fb6317ccf532ba02a990789d647ccceb1732b1dd10dd368786204ed68241f3 SHA512 c21dac80d31f7adc5a1e7a02e5a755ac8d68547a9f25622d55e6d87c924a2535ac496ecfebcae52b1995aa414362a9005be4e2b390d0e01dab22bd692b16bf49
-EBUILD hcalc-1.2-r1.ebuild 539 BLAKE2B f9ce814fe4521f0fe661aee371a26a797f2de56a5dab4cc5f23c2fc41af301d4414dc332b21d359c38ae740826afad1047d3886c2b9a01745dc6a191a484751e SHA512 2e0909fc2931f0e709142c8657df1db459baa478e14f65876f76086b8db632cb3a38d55459c1313d59d6986accacc29bc80c053351379f4cde675b948829b70a
+EBUILD hcalc-1.2-r1.ebuild 571 BLAKE2B e7c2db4f2d98d0d662f7b55af515310de230fec2431ffc9a306029aa0191eb0ace12f6fe669e0e14423a5fa14dd88a2d8ac9450ac8365eff7c7254f8d170deb7 SHA512 4b9c94b2913556176d79fea7b777aa628a5282f18152090ea0832dca92e25a226b72c792aa4c75c2f61e68d3326434cf600099d2fa1087ab4fc661a5fc1c3f1f
 MISC metadata.xml 338 BLAKE2B fb4b1e01580deed6dd66a84da366f6b206ce5812d37fbda52dc15afd3ddee86e0a41d91578bf8b4ce6699a1f477b712371316bba0f35c851fe5e5e12885916f8 SHA512 22d8e0d0a68f19e337497b9ffe74d36e77825d0bd3bfbf845c8007f81aac888166f29480265c3473b3337980e3148837785f7be9e79b88446c96e6147e15bbea
diff --git a/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch b/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch
new file mode 100644
index 000000000000..b8bdcc73e305
--- /dev/null
+++ b/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch
@@ -0,0 +1,13 @@
+--- a/hcalc.h
++++ b/hcalc.h
+@@ -25,8 +25,8 @@
+ extern Pixmap face;
+ extern Pixmap chars;
+ 
+-int bit_on;
+-int bit_off;
++extern int bit_on;
++extern int bit_off;
+ 
+ extern int char_to_x[256];
+ extern char charmap[];
diff --git a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
index bbd0de3fcfac..6a6b90666a0a 100644
--- a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
+++ b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="DJ's Hex Calculator"
 HOMEPAGE="http://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc"
@@ -12,13 +12,14 @@ SRC_URI="https://github.com/downloads/jlec/hcalc/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 pkg_postinst() {
 	einfo "Enter hcalc to run and use kill or ctrl-c to exit."
 }
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index f65ac29da36d..6e681ccbfc03 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index d960db48065f..0c799502cd11 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,4 +1,4 @@
 DIST pymol-1.8.4.0.png.xz 19528 BLAKE2B f3d23d4cedca3d8bb96b20646a548da4be570697e3346a11b01c5c3599b536ba4697be08472dfa8a4f6533167defc1a37a1de332931a73857319cb28fd42cd2b SHA512 40bb0d3f226476f6e047b5361956aad955232a97641474765eaa5204f0539aee3810e0266213618a45364f9f31f6eb18380b17e0c79f64065f7b62a9016caa7c
 DIST pymol-2.4.0.tar.gz 10552539 BLAKE2B 34e31dce99c1e838b00389c3d7c29657534dd037349769bd6c8cb17028cfaaa856d5729760d3768fd43f61086cac30749a864fb4156c14eda07f9027430f0523 SHA512 2b19294197d58a808bf7bb7fa9f829c2ec582ba47a4380783a2b1eedda2ce4118cd398e01885db8c449e7fd5e4c08a1c40508e679ef42d8e183a6a52b031c02a
-EBUILD pymol-2.4.0.ebuild 3052 BLAKE2B 432df45df49ee78cd757bd64201a7da1afe1a3d39410ce107ea115de01f015f723ae69a7915965230a16bc92d6b6a2c3639b861b5cf35b3bc4ab7e221ce63721 SHA512 1f30649b9686e03f067c2e07720ce250f3c6e741b64e71adf34dbdc62b7226099ba34538e49c1d677cd80984962e0c2710cbebf2b5506ffc1a49f871b1b64d0a
+EBUILD pymol-2.4.0.ebuild 3080 BLAKE2B cf0b1e7d50edf615fdf82e1a5f7920f6095e402feed21b860dc1e21a11e833bee430f7b0b11fe85c0f74e2aaf3852f09ab5f7e35beb6af7d775c7307523f0aad SHA512 bb0113cdcbe8a10bc59a0aee51d305a72bdbe5a0d5b17baa586d8a98b66e8ce7db8086e9c8671d77131a0d3d5541cdc8a3210ad0d2feef30d337f0cb3afd0411
 MISC metadata.xml 439 BLAKE2B 68df7dfc8ca3d4d4b18b419532bade69491f2e9362f10ae2397c804132b7fc9cd08dcf9703c0a89c44588c570e0c0c1bb9bffb7394d51faf1283142dbc5f70b3 SHA512 f5a3eded9b12fa715ba2e6e10b41c75d9bd823ca0dd40acbffc3f5bfc4b36c687f720b1a4e119b4540a31faf849985778cbd72b0b2cd35af8c52ca0f808d71e4
diff --git a/sci-chemistry/pymol/pymol-2.4.0.ebuild b/sci-chemistry/pymol/pymol-2.4.0.ebuild
index 04ac2f9895a0..6ff6e2326d92 100644
--- a/sci-chemistry/pymol/pymol-2.4.0.ebuild
+++ b/sci-chemistry/pymol/pymol-2.4.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 desktop optfeature flag-o-matic xdg-utils
 
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index b9465df5d3a8..e78f781831b2 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index 1e45386ef99e..e3797211bbf3 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -3,8 +3,10 @@ AUX xoscope-2.0-implicit_decls.patch 687 BLAKE2B 9dfbb8f802c51d1eb1450673253246d
 AUX xoscope-2.0-man_no_-Tutf8.patch 369 BLAKE2B 7deae1551cda55e640f65f51ecf0f5e41ddcf7d234c1d8931b868f3e865332e23bf153f4dd662e08d81eb3dcb6db77d8db27ab823b4623932989acbc770524e4 SHA512 fcd9522fb8d45a565983d1da4cfdb9239cf2c5c994069ca2fa934fee9ec23d99b9e877bfdca5b0baf01f9722f7fdff791c99f468d088947961758fbb75bc2a0a
 AUX xoscope-2.0-remove_bundled_gtkdatabox.patch 6577 BLAKE2B 4e76e0eabbd7125be9a3c28eda71a9aa8f77f0d47bef3aeb00a5256ffffe70f12294ffab4a5365a30fa801bb0f82e05a6ed187c99c2f3c96bc9760426c1f39c7 SHA512 1a64615e99cfd160d28d9e1da04a000fe538b52b770b77db6fcbd907306aa67172c6848edccb6467f2b2e008bd243fc2c12949c91087fc17deb7b9bbc3980b9a
 AUX xoscope-2.1-man_no_-Tutf8.patch 392 BLAKE2B 9eb444b50aa67e2bf61941ef9a3f6ce02da211e75db48bb9126cbf3da0e3ae93039390ec9217877a021b9d22fff2907b6af9c85842bc261cc4e6d20f3b244f8b SHA512 aa1347e5e396f5735606e61cf90e1aabdffb7d6c1f3ebe6c778a7324d7a3c0b8a31e0b9ec4f380e14db336d82e0790c7d7f7dc197684c140de8822b9e5e4299b
+AUX xoscope-2.2-fno-common.patch 489 BLAKE2B 3496854eb8a9437181178e7e78724a8fec2f11bbe2db0404395ccc09563219ce0088a14aef6494a518ed007c7a1892d81212e49020d5804ac20abaeeaa543be1 SHA512 bbc722fd45b999415e912a35ecf0be0ab9f8ec3e0d8a046bf3a094256d85eeb655d4a358b8dd942b9bafbd8175d8e3d0dfc74acb9ae4fd4d74498827ace5f42a
+AUX xoscope-2.2-man_no_-Tutf8.patch 421 BLAKE2B b8ba8523d7d6d717de4e4fb1a60061c1f929b095cdb9349b624ad589b39abae48f59cef33aa67486c3550594945b0260b8be494a950c6fad73dd597d1826b99d SHA512 54b39e8565cd464e014d111441edc8d191d85d07d4bd04679df3c771b9e28b3d7b619ae90ee532dcf8ebda6e79b5a3452130fc7157f79619e74cc8b3600d398d
 DIST xoscope-2.0.tgz 334875 BLAKE2B 67d3058e822ee4d2a410f92be4ec397381d66150be636bcb799eb13f20326aff0075ab5e1067d2f72a9fe30eda3584228f3ea637aa649554c6f43261a24717e7 SHA512 8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70
-DIST xoscope-2.1.tar.gz 302170 BLAKE2B afd706d51fe2b63f5e948d9dafd56a16eb9368717536514f1e734909a758e585893101b0dd381ff3d45da958212f35ea76b44f4689d3242cc731cb7371913d03 SHA512 2ecc75d04d36634d83b7c6636dc7e45fb068ae37e0ee1b0e97c65f9cd56f7fe0e511828821fa0ca2cfe4c6cd6a05e8d23275ec96253dc6faec91db4cbdecd13d
+DIST xoscope-2.2.tar.gz 307319 BLAKE2B 860fe234e5958a005ff0cff5143fcc0711d69b958e2f6277589d08074001872b065ecb435493285231ff0c61aea1b50b221aa36127b25947184e059e951a70ec SHA512 77a1d7d673af3d82e5a3d563d6901c3d6f5a16a1d889e9b95ac2d7d10c8036461a94fb841266b6d131e96303d4fce47b4bc8255b3855690e9148ead6c38b74cd
 EBUILD xoscope-2.0.ebuild 799 BLAKE2B e9ef29f04f320d4114604bd1b82d850d39e8bcc9ae2970ebb8cfea4c7b031c359457b64a824354945d8f8a47176effecf0529c2648dc61495f3e2588472bdb85 SHA512 9242f5d321c33ed88e6e30aab6f8b5b05ea34e2cdcba82e164b16591b7b76e1c147543f6859490221faa0da2ceb46a41e6452869241150c9c7c992e3f95907dc
-EBUILD xoscope-2.1.ebuild 647 BLAKE2B d42679bdbd49c187f515fc5f5ea037a75e334044d87e0ec7763893b436d2a074cad422f2c23f394b3568f50a3d0d26dea6806e4dcc529fab30979dd50c375b0a SHA512 d5a829921f24e0ba12e0b590abec347444486b519777ab6f41c4812f56c84cd561414ae11ca6881dfade3877871c9b38bcf0d8d7899bec85f87e4c1a49e8d692
+EBUILD xoscope-2.2.ebuild 711 BLAKE2B 075e333b7745daaef2cc013ff4124c80ef8cc5ee5d5049d7307944fe0385ea4e7a07243577f1fbaa72211417e932f274a57d434b6f4437ae3116cc7d778278b4 SHA512 ce8362af320662d8e5e586bd791f935241630b8486ca115d1e65cf13ac4734524dee2571847fdcfb9bf6a676521783b51c0fb8c5dd04e2e57edace78a16f36c7
 MISC metadata.xml 346 BLAKE2B 8403235f2a8a0d9f4d447bd869be01c1d3c631058d17866a8123f4434d67e487da9cbaa26ae398921dd75e3bcea34279eef96a837dae37dc50597a1ed9baef09 SHA512 c274d9938f31775989e53e8a66c470ef2df048a52b7934be3e0f8107784feb19160e9d93d2f970c84ad3b9d19da857be6ccfd6ae547ee71c8920f2f9430a7943
diff --git a/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch b/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch
new file mode 100644
index 000000000000..124a8fdd767c
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS with GCC 10
+Bug-Debian: https://bugs.debian.org/957990
+Forwarded: https://sourceforge.net/p/xoscope/discussion/23485/thread/d6fba12f59/
+Author: Raymundo Cassani <raymundo.cassani@gmail.com>
+Last-Update: 2020-05-20
+
+--- a/display.c
++++ b/display.c
+@@ -35,7 +35,6 @@
+ #define DEBUG 0
+ 
+ int     triggered = 0;          /* whether we've triggered or not */
+-void    *font;
+ int     math_warning = 0;       /* TRUE if math has a problem */
+ 
+ struct signal_stats stats;
diff --git a/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch b/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch
new file mode 100644
index 000000000000..a0f54eb26e37
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -132,7 +132,7 @@ AC_DEFINE(CHANNELS, 8, [max number of channels])
+ 
+ AC_DEFINE(MSECREFRESH, 30, [minimum number of milliseconds between refresh on libsx version])
+ 
+-AC_DEFINE(HELPCOMMAND, "man -Tutf8 xoscope 2>&1", [shell command for X11 help])
++AC_DEFINE(HELPCOMMAND, "man xoscope 2>&1", [shell command for X11 help])
+ 
+ AC_DEFINE(FILENAME, "oscope.dat", [default file name])
+ 
diff --git a/sci-electronics/xoscope/xoscope-2.1.ebuild b/sci-electronics/xoscope/xoscope-2.2.ebuild
similarity index 60%
rename from sci-electronics/xoscope/xoscope-2.1.ebuild
rename to sci-electronics/xoscope/xoscope-2.2.ebuild
index 5b730bc12bc8..a51858f54bde 100644
--- a/sci-electronics/xoscope/xoscope-2.1.ebuild
+++ b/sci-electronics/xoscope/xoscope-2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils linux-info
+inherit autotools linux-info
 
 DESCRIPTION="Soundcard Oscilloscope for X"
 HOMEPAGE="http://xoscope.sourceforge.net"
@@ -12,18 +12,23 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="x11-libs/gtkdatabox
-	virtual/man"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="
+	sci-libs/fftw:3.0=
+	virtual/man
+	x11-libs/gtkdatabox"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 CONFIG_CHECK="~!SND_PCM_OSS"
 ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input via /dev/dsp"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-man_no_-Tutf8.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-man_no_-Tutf8.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
+src_prepare() {
+	default
 	eautoreconf
 }
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 2d6dc3fcab18..99f11df1977e 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 85fd10273c21..82da04440a6d 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -2,7 +2,9 @@ AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434a
 DIST gpxsee-7.29.tar.gz 5363181 BLAKE2B 4d3a5693a7b5939847c2dc32bff205649264766975c6313220e305770e40602f40e03c74db22e043860f1a2953a43e7ec0a58624f4882de93f3320a32dc6292e SHA512 e4133ad7a9b5e25f3c0bdd2397e02b6219e81f8632385e6423244e7c400ff72a5be85720f1ec123428ae3aeca79cac81e03b7f40de83d309e55ee69ee7cc933f
 DIST gpxsee-7.35.tar.gz 5403169 BLAKE2B 901c77aa0fd0a54976a8d88daa98acc0125dacae7b9e45455ed79f2c633f33a6311dd3c9a388eae1350dac82ac1e02b811680b15f161cb8a523878698d993aae SHA512 d3346e2ed8593d5b57c2484a2153c9900289380a79799dbbe587879c9fc0b3e95d21f14d178e7e2a4b586062cc22c4ba1d90b3e66e73f0c334360f3b04625f8e
 DIST gpxsee-7.36.tar.gz 5404628 BLAKE2B 252acab21aed260eb6f01b9ee38f3c7a88067953b9e481cf2c6e77fcfd52c14fb995c69330dd381fbb3d2b9f7ea5bd345f6d2d3ae8b5be0f6b020680ef9e5f21 SHA512 8a0c718e80544506a6e393fd9b95a2d29092332d8c9fe141351cc1e3553759c909aaac12953a0206dca47f855b8516ecdaacaee577b1ce3dd0e75be2595e4062
+DIST gpxsee-7.37.tar.gz 5406206 BLAKE2B eecc311a89ee94aa1e52cb742802ee78634199d13173106938b559f787029df2496a60642c08109928051cd0d478b794f8ca0db050fe4406b2aca51c290d317e SHA512 891689e78a7cb3ece63d28cc892cadd483770ab88add241021bcee70a6acb744410a9b412e0f2286e63552eadf6398671c25a594ef02b0a09d8ecf89fa9ca278
 EBUILD gpxsee-7.29.ebuild 1330 BLAKE2B 0d730eeb63edd9346d61c39e7837eed78de1fcd84c7d14dcf115d6d673cd6905bace2ebe4b6c1063facfbb68148e66c80ef55adaeb54841ef72221c017671d9e SHA512 9b97ba9c3d5c010e678085f1b8a20228798ed0c32b1fe4ec7381e6dc14a858293e0fb5b2429e649552606abf96a142ef10462bbaa0058808eff6eefcf528375b
 EBUILD gpxsee-7.35.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
 EBUILD gpxsee-7.36.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
+EBUILD gpxsee-7.37.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
 MISC metadata.xml 452 BLAKE2B ff5c6d1a028e9e7c38ac529383e5b80a668f142ea84e742e2c16c48870b4b961580e6b9bbde24eae4a9200d942a58e0c3d14d7e52cc261be9417f04d4e0f7459 SHA512 87df33dd06fedc5f454445089edf56d13e27d683b8faba7aee4f29493f2c38989fb252b851bb59a36665e4431cdcf58d8ce35c23460d957db5d928bb8f1d03d4
diff --git a/sci-geosciences/gpxsee/gpxsee-7.37.ebuild b/sci-geosciences/gpxsee/gpxsee-7.37.ebuild
new file mode 100644
index 000000000000..d9d146091a25
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.37.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en es fi fr hu it nb pl pt_BR ru sv tr uk"
+inherit desktop qmake-utils l10n xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 9b0e4b35ed65..c6cc953b7f6d 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -2,7 +2,7 @@ AUX FindPROJ4.cmake 5695 BLAKE2B 916e3cb12a6dfb8428bfa97d74dc34b4b357935cc6be1e0
 AUX qmapshack-positioning.patch 482 BLAKE2B cb7d7b8f74a23828503c76e0cf3c7120af1aa412512461ae0e3e4a051ed7d8b89f9254a2397767b6ff56f1cbeefb1a6347f546222e991946dae3235da194d774 SHA512 245524903ec5db0da9d1874f0b5c0e2a318f6b955970da2645cff6dc1b21adb0565728021feca2cd236af9d2e60325e0bce1bb8084390d073200c5bad65d7175
 AUX qmapshack-qt-5.15.patch 3026 BLAKE2B f5f15429c198235658ba726b9122f72000c6f947d4dd4de1fd871e04148640152ca5caccd662d64da787cf4eef5841431b7e1d6d1e5e0dd310c099b14dac61d7 SHA512 7475aa269e2e502e8df2c2aa7d4f993f720284a8a190f09388581560755d9e18f1082b4e99106e934b5e02ef60fb7b8c620b02e650243b770dbe520367c2ebbb
 DIST qmapshack-1.14.0.tar.gz 12541988 BLAKE2B 146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55 SHA512 675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
-DIST qmapshack-1.15.0.tar.gz 46097781 BLAKE2B 16db9c59bd669e55dbb67af0411570963ff6a59f24c75d62421540fa1437cbc4dd837cf115b2649b3482e191ae11040b567f34babbf9ad46bb09114727ad4ae9 SHA512 92e2b40c37cccbb4848dab1afd872d3cb29b4a162d44d57a1042ea0d5139ffc976bc02407d327b6f5cd3e0d08dbd526661fcbc0e05602fda15f78fd9bbce52cb
+DIST qmapshack-1.15.1.tar.gz 46265787 BLAKE2B b690d1e0ac698cee6969ef3cf35dd3b6102dd292993695fed81416a2bfe396e88bd8004b03a7eeb5df30c817331b83c55452f96200bd6c45145e86eb163ca988 SHA512 c01fc75fd6466a97e82b8f9822dfada87ededcec53e62a3dc42e36463c195ad4ba16c19a4748d48b26a0e957303f2724ec88eecb5d64676c74dbdaeebfadf17a
 EBUILD qmapshack-1.14.0.ebuild 908 BLAKE2B f9c544be44c80f5aa9186e3d0671419968e8db35dea918730de52a1e086d487a5326f1fc5ac3b133b684bf0bba9a6e9e6c87de093b2afe5aff192cff3adcd0be SHA512 5c10b51323cb326cc35e73774ce287866cef7794c324dbe3730590db1563c6fe4e7ed7cd5601bc907b012e92dcba864d05907b681bc4f83c73b9252c3fa02d9a
-EBUILD qmapshack-1.15.0.ebuild 1137 BLAKE2B f6a5baaef7fce7a5457ce0b7c76bdc93be982f9b646b64d8f00b1a644a87bb322cbbb22d2a8889734f25a6fe75bd9219075466a6c3a056f5c177bd9ac92bd823 SHA512 9465f489cbf1398796d1e846bfc070fe83046630fb1fff4686a616c66810c5513b1e2531fc6b82372a4cca55aff2c5bd99ac4c7472f6dc7a8c55dceb9504b56a
+EBUILD qmapshack-1.15.1.ebuild 1008 BLAKE2B a323d85a6f25f40c7fff1edd752ec70fd4c0befd8b8f209d4558867a9cd54308a7a19e0abc47c4b8fe40748bcb2bca13819d47a5930d2430550711429e391ae1 SHA512 abeddc1526a64a1a683f6acbcd4c891e96f6cfcf452fc1566027b8f0d690e70261e882066234e7fc1e77af009f2d279227accb479aa796d656ebcc510cc7f09a
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.15.1.ebuild
similarity index 71%
rename from sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild
rename to sci-geosciences/qmapshack/qmapshack-1.15.1.ebuild
index 1d7bf8e6abf5..2f083ca83c76 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.15.0.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.15.1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="GPS mapping utility"
 HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
-SRC_URI="https://github.com/Maproom/${PN}/archive/V_1.15.0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -15,7 +15,6 @@ IUSE=""
 RDEPEND="dev-qt/qtwebengine:5[widgets]
 	dev-qt/qtdeclarative:5[widgets]
 	dev-qt/qtprintsupport:5
-	dev-qt/qtpositioning:5
 	dev-qt/qtdbus:5
 	dev-qt/qttest:5
 	dev-qt/designer:5
@@ -30,16 +29,16 @@ RDEPEND="dev-qt/qtwebengine:5[widgets]
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
 
-PATCHES=( "${FILESDIR}"/${PN}-positioning.patch "${FILESDIR}"/${PN}-qt-5.15.patch )
 S="${WORKDIR}"/${PN}-V_${PV}
 
 src_prepare() {
-	cmake-utils_src_prepare
-	cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die
+	eapply "${S}"/FindPROJ4.patch
+	cmake_src_prepare
+	xdg_environment_reset
 }
 
 src_install() {
 	docompress -x /usr/share/doc/${PF}/html
-	cmake-utils_src_install
+	cmake_src_install
 	mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed"
 }
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index c06fb4d2af60..91b4d96dbccb 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 894312f24e4b..c4f6e807c046 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -52,16 +52,16 @@ DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932
 DIST tensorflow-2.1.0.tar.gz 41637803 BLAKE2B 63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff SHA512 6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6
 DIST tensorflow-2.2.0.tar.gz 42100791 BLAKE2B 8b773ae9945ca267af33a34d86f6aef02310976bea1cdd98858d1405e8da845640b72a073b71fcfccb2b73f08600a5eada2c2332a8d9480bba71e9f25dbb2220 SHA512 94a2663497d333d543f363e9fea94fbcfdcdbbc0dfbaf009ba9181a808713aeb78f9b8805f56bea5fd3925a36f105427b3996795750589f378d8afbdadc2b86d
 DIST tensorflow-2.3.1.tar.gz 46544608 BLAKE2B c3cb0954fcd060b95d63895cbeeca20f6af29ade999dc43db5fe010d6b33b6f650047d529f174a1663c23440a56e057e2f97c503a4a40bcdac9374b549f3220e SHA512 e497ef4564f50abf9f918be4522cf702f4cf945cb1ebf83af1386ac4ddc7373b3ba70c7f803f8ca06faf2c6b5396e60b1e0e9b97bfbd667e733b08b6e6d70ef0
-DIST tensorflow-2.4.0_rc1.tar.gz 53249752 BLAKE2B 14f4c1d37c9086485b768fa17c9cbdff2a5cb40bf4456aff8739b4ea224889551b08c02a7623866f2e7af3c7ec4a940de2b41cd64530ee4b47508e1747ad15db SHA512 38f06026dccff91c981e8ca0d1164f8f78710238184b6163e2e8ead26863fcf7daa074b1721114d0ee8efff127c42d94b65b696368ad91d74fcb81b5ef41a225
+DIST tensorflow-2.4.0_rc3.tar.gz 53251141 BLAKE2B 45a05fc1bc6f5f940487ecfd53a5dd37718a39a2a3dfd536cb6e41ba1da9fbac9e166aeb288ad122adc6474af94c13a2370779c37aa7162de3cb0c015acd5c44 SHA512 c02901fb41aa996a4d3c4a118cd76c62502e99be64f6ecf98208b2c65ed9f8c87c4060dcc983f6fe8280207b3bfa967e5f325e2d926aa1b4429f99fc0153c2e1
 DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225 SHA512 a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed
 DIST tensorflow-patches-2.2.0-r1.tar.bz2 3890 BLAKE2B cf4e0d579992cd09136fe3a11c5016e7b996ea959dad9f3a1ccff2fa623c2c4eab1c6673dfaf08b3b01220fd00c9edd5966e1162049f6d1e4fe5af280f491850 SHA512 8d07c9351b75faf90a137f65c2e6147d884744c5ab9b0bacadfa7bdc7b66ec2ec92920c7d23396bb70f7f4fb290f3f818591f23c6a4e91ab1a79290cb4ea1533
 DIST tensorflow-patches-2.3.1-r1.tar.bz2 12300 BLAKE2B 068c127d7e980baf63068c524c9411e4f19bb79ee369221cf474a964a15ad340b28bde09504a8d524167eea036caf9d2dc52d0ad7ae1e52a76d1892833b033a0 SHA512 510676e4f999c12331a61bfeeca45b2526292d8bca8b0b42c1d8d466bc52722075fbd4df26a5f67dbe1ca4ccd9059e783c113cf694b436ff48c8114c99234cd3
 DIST tensorflow-patches-2.3.1.tar.bz2 11361 BLAKE2B 22ddd827f616e33fd259ce2b7da5cda539d856701ad108d1d3b52d1dab660bcddc809fd9e9db5e6496552df080493b0205b83a58dc32808dc70c60a5878aa8af SHA512 cdfc3407c775f8529cb8eb939b1046a7094ff999b8225e419e2ab4be19ecba6d853ebd8cd2dda77a7f60425a440f4d60bf3afca4a80688f0cba9967e14f8b8fb
-DIST tensorflow-patches-2.4.0_rc1.tar.bz2 1843 BLAKE2B 6d4188471502e4411a5a7a6e731142af38421961600c52e7d76d137f952a5b8327dc8d8b4a40b60d3fb46130fe3d40ae2adc3d60d9a882f9d9b07d424e45e194 SHA512 abf9fbd870a8fa59b9d4e1b8260c4fbb5badeeca3e2b77caa031036759302bccae4adf91b291bc7a12df3c679b887338a8cd98d41847eb8ddd0c2bf4b8ccf342
+DIST tensorflow-patches-2.4.0_rc3.tar.bz2 1843 BLAKE2B 6d4188471502e4411a5a7a6e731142af38421961600c52e7d76d137f952a5b8327dc8d8b4a40b60d3fb46130fe3d40ae2adc3d60d9a882f9d9b07d424e45e194 SHA512 abf9fbd870a8fa59b9d4e1b8260c4fbb5badeeca3e2b77caa031036759302bccae4adf91b291bc7a12df3c679b887338a8cd98d41847eb8ddd0c2bf4b8ccf342
 EBUILD tensorflow-2.1.0.ebuild 12365 BLAKE2B d895256b37ee79be36d83745545e6515366b64121c0bd5ec79544827a4492a327ca26593d06ec0b42745ef9bfa213a251eef2bd7c9093d8b461b744035d18cf7 SHA512 d710ea279a2e0b73749a0b4a947a98753e11a6ac14799b9d5e45e3e63afd776aa8047d44d66b831d49df686fea65f0663133f8639080f722fbbd6254d6025b46
 EBUILD tensorflow-2.2.0-r1.ebuild 13506 BLAKE2B 075b271e2e559ca7640f1cb86f7392b4bd40a53d518d42f295ae762bcb465498b901fdd24805de76f8e50e5abacc1b47f00397553c471a7b5393ea8eb5dcb8fe SHA512 eb845b0233eab0782fc1213375b091a7a8be54df6796f46cae4863bcb4be92cd7028a30cacc43d9347bf04c14471283aaa0fbb6c56052fa0dd6cb6195b86ca94
 EBUILD tensorflow-2.2.0-r2.ebuild 13634 BLAKE2B c165b9acc3d6d507582cd2fce0986147cd41efe3c5648c7b054fae17c2a0672e3e9fa54eae097618781a6b9a97a7c5c9e5f4f3feee7965b49df367c2d4046558 SHA512 68f1ec80071b447d0c9cd459a3cd369f6dd619432ae6fe44d85e51487d0209e4960505bc7eae26d0b21680e37c30b76b0a4eed97b84f831be54c7041ca31c86b
 EBUILD tensorflow-2.3.1-r1.ebuild 15189 BLAKE2B e34ed5c8e554926f1b6441049b1f2368954e243dbe66f0ed1c0896f5c0eceb7b6613f2547b0a47b9493f08410d25813fbc800a3479138fe3e7f444f2d125f342 SHA512 4d46a272581266c1a905a675c1071b82027af7fcca3c86831eb2e9908cafa004da4fb399136568263e6aab7584025826c432dce86024cd34b59e1f7e8749da30
 EBUILD tensorflow-2.3.1.ebuild 15183 BLAKE2B 15f3de2530ffd1ea0c9e0383b0d90a2f0b7912ba62d497d56609ffa9be19df2e0f57304d6459a83b0a5e3bcb9410443656d8554595c3e5a2dd08803893c51467 SHA512 84ccd970c56eccdd9350fd56d4aeeffedbb1ad2e0be2fd58a416856f97b1d9f79ace4dffe41460fe6f2e6ae6d2030d7a3ee8720a99844fc3c97e23211cee50d7
-EBUILD tensorflow-2.4.0_rc1.ebuild 15113 BLAKE2B fa88f76a7c9e0a74ddbd0c5333b8b6542326853b6fda6fed186f9c98f0af09e05f1f036eda1081f9e008a37e41483b625986ed108269318e42d5c0ac4da6cebb SHA512 5b3f74a703dd1639175dd4d024e346b8d3068bc1f0d0516333d9efe8dccbd7d8106fa50be87fa1379cfc6adc00e6272e0209bee3e8334d66c1e5e4d66bc94b25
+EBUILD tensorflow-2.4.0_rc3.ebuild 15113 BLAKE2B eef8b30297a6205c06d0f30f99e6334d8e47caab65aa373b4f11030e9a70f35ded6ed79b1d645056768df3909a5b4743986c976e88f56cf1a4191f866aabb18d SHA512 aee40802e22d700fa218a73abc847dc16ef0460e1b6777600abca6614c7d0729b9f3fdca112d007662b0bbbe6ee136e78180ea86d50561e9d7c276a9d687925f
 MISC metadata.xml 500 BLAKE2B 05036ab51828503c91b561bf087bb0a4d0cd6aa2f68dafa51499a5b57c33bf04e4f413aca576b62eb60b233467405a346c08d72b3c771b9f3fb4e099a55bd3c5 SHA512 ca5c67f8ced7d0f5ebb5f261c7adbcf23ea31b099e0aa3e1a3f6fd37df7d3558706af4df8411fc421a3b99c8615df7c5f07c617d7af275eccc728e76ce509458
diff --git a/sci-libs/tensorflow/tensorflow-2.4.0_rc1.ebuild b/sci-libs/tensorflow/tensorflow-2.4.0_rc3.ebuild
similarity index 99%
rename from sci-libs/tensorflow/tensorflow-2.4.0_rc1.ebuild
rename to sci-libs/tensorflow/tensorflow-2.4.0_rc3.ebuild
index 1481f3084184..3ffae5ad6f7f 100644
--- a/sci-libs/tensorflow/tensorflow-2.4.0_rc1.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.4.0_rc3.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 		>=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.3.0[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-2.4.0[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
 	python? (
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index e653de0b8a94..562c8619b4df 100644
Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ
diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest
index fbe048a5c656..1fbe66e3c8c3 100644
--- a/sci-misc/mendeleydesktop/Manifest
+++ b/sci-misc/mendeleydesktop/Manifest
@@ -1,13 +1,7 @@
 AUX mendeleydesktop-1.17.8-libdir.patch 578 BLAKE2B 70213348bc2235cea44461bbe371b24b5e9db17ae8a6862d143bdb698e5e7b73dfd665fa32eee0bd6a1a47a2efdc081072a9ed979d5d797b9ff652405ed889e6 SHA512 80aa6539af89efacc382929331ebe0c3a682329cb167d45baa8f6eb85391d6112218fc468cd4525d76afbea568599860aa53d1296e6733d266a30522fde1fa16
 AUX mendeleydesktop-1.17.8-qt5plugins.patch 604 BLAKE2B 198f5628b28921018570577bacbe2e7de011e2e48c60b3727b79db966e441d3c270b374db7790b9c6338239071cd6fbc17c0b1f8e59cf68794a85c1daa906664 SHA512 c2f95d8a5cca3b2cc57ded01e9bda21bd4eed990035bff1864a2b751b5cc57821b1ab5fec9b1be52a17be34e4d15a487b19133afc08a05fac50b13975e002daa
 AUX mendeleydesktop-1.17.8-unix-distro-build.patch 599 BLAKE2B 8ae42be0372af430d1308836ed4ffe4b6b09c67b64bfe0f76b292e95bf198e698cf9dcd1b284aebbc117111777781fa8a3f007e500b3d61499c10c2da01fc6f6 SHA512 2de6e5ff400871cfbfda3572566ec83db81fcc12aed9f8dc63c5f8a9b32cc4cf985dcfe02d56548351999c94b2d575585ee779547714aae932cf9fb042ace644
-DIST mendeleydesktop-1.19.4-linux-i486.tar.bz2 155476937 BLAKE2B 4f2ae744b46940d55e3d3620d72bd35530f906a117edf89a5e020bd98ae79ac2541ea605855f6fcf79ac9b0ca7340cb298bac65c01c42c4014f994c0da47eec9 SHA512 d70e2e7d29bee69b943f800e971a1e02b3c09c80e25113fc91ed2df158100d77fc46932074bcbd19bd0871676f9e0afa0e0fd20dfa860b3ddce72c89597dbdfd
-DIST mendeleydesktop-1.19.4-linux-x86_64.tar.bz2 159335193 BLAKE2B 583238552309c935ffb36ff2904ae64cf6feae4607b0c1f479fd5744bbdd301181702e51b02220a70cadeaa9f4ae1fc4b63d91b75870fd641cee8b5473becc6f SHA512 b3e6cf2ab2a1584121d57f9400ac363a006828c4077d66781c04ba75af18830ca803074c6517675b8d1f979087b1778ba25435ed549eaa4e38b5684d5ed07f6e
-DIST mendeleydesktop-1.19.5-linux-i486.tar.bz2 155700577 BLAKE2B 4eeab5ab0d8f5292a2a1241553b925e692bb66122ec289906cafc7a61993985c21f57fd60170b5b0858b0d8f6f3f0d74e66fc0b397b2c8fe0b2d7e108e311927 SHA512 3618ded22cd6b7c7c5bf2a07cf2ea717a2371a7748e09d25f4ddc0445fa79aeb58acf5e5a1b9382f33402552c27365403e48f59fb0f3d092e8987e5f075bbf02
-DIST mendeleydesktop-1.19.5-linux-x86_64.tar.bz2 159458350 BLAKE2B a84556855f82c2e011cae0d4d44cf949a2cc3e133f2f94f7264328b69dc714f6a4eaf8cd62b8b78a049b3eaa73ae924c865b3e692f0562ffceac3dbb4fbc78d2 SHA512 286cd25739ad2c9ec66aba7f15f085ed4f9c66194b970d57f82c93333f83141e6e1df2577aa7dc83255a4b04b2901268d7e3041aadc606530eed740d27a9cc30
 DIST mendeleydesktop-1.19.6-linux-i486.tar.bz2 156023883 BLAKE2B b6e962100fe4f7a93ad9922bb26ec224cbece1de8f182394799f758942a7f5c666ff959d712c74c250a3dbde082a168250ba92d0a70db30823ac70d7526b6192 SHA512 8d610043abb325a8396256b4e6fca53db9198be7fecad0128120e79279b5ea048240fd98ccb9833d885eb9f9873b8479e184e4103455528d6a897011f798e2f0
 DIST mendeleydesktop-1.19.6-linux-x86_64.tar.bz2 159780391 BLAKE2B ca61beff5b213a3e2712aa95a3f8adff2639e5c22ab2c6cfeddfb985e427958397601f986f0c75b979a22e0119ea4a31dd3ec9b7f1f223a9798b949320e3b07f SHA512 7baebb8e20b7fb47ae49c5d8378469fb30f74f36033b8d9820ccf2b5559a184ec848a2463464c42d526d42c9c111c47e440e3dbf681b4e87dc5eafb9a42cf8ef
-EBUILD mendeleydesktop-1.19.4.ebuild 2891 BLAKE2B 76b3cf8580bc49085081b7c36bee179e6cd590ce016b68ea4d25062471bbc14a9fb6d9e5a9ab0fc909d03bbded6546e2873b9cf71dd24262083d592891874898 SHA512 72c26b016b96134690a87535f948ecebee305a6de59e800a5b9088c683f0416cd9d151d3d794c250206ed2771c3bc8d92cd84aac48d35a7eb90c789036cfc11d
-EBUILD mendeleydesktop-1.19.5.ebuild 2891 BLAKE2B 76b3cf8580bc49085081b7c36bee179e6cd590ce016b68ea4d25062471bbc14a9fb6d9e5a9ab0fc909d03bbded6546e2873b9cf71dd24262083d592891874898 SHA512 72c26b016b96134690a87535f948ecebee305a6de59e800a5b9088c683f0416cd9d151d3d794c250206ed2771c3bc8d92cd84aac48d35a7eb90c789036cfc11d
 EBUILD mendeleydesktop-1.19.6.ebuild 2891 BLAKE2B 76b3cf8580bc49085081b7c36bee179e6cd590ce016b68ea4d25062471bbc14a9fb6d9e5a9ab0fc909d03bbded6546e2873b9cf71dd24262083d592891874898 SHA512 72c26b016b96134690a87535f948ecebee305a6de59e800a5b9088c683f0416cd9d151d3d794c250206ed2771c3bc8d92cd84aac48d35a7eb90c789036cfc11d
 MISC metadata.xml 386 BLAKE2B f7b77dcf87b678d7daeb1399a8e3523adbbafcdfa3f775bfa349171b6ac8d4af6dde360a2b6c3281f34a6729d1c146b215c2730f6fb895f60a99b7b75ffddf79 SHA512 34a3638dec2839d2c4fab397b571496793d2a87d8d13229e9b57965dc994ce648cc42a561437e3d0fd09c1c9aa1c9a29987709b3dee3365bec59ae0a435f9463
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.19.4.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.19.4.ebuild
deleted file mode 100644
index 5daa682e978a..000000000000
--- a/sci-misc/mendeleydesktop/mendeleydesktop-1.19.4.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit desktop python-single-r1 xdg
-
-MY_P_AMD64="${P}-linux-x86_64"
-MY_P_X86="${P}-linux-i486"
-
-DESCRIPTION="Research management tool for desktop and web"
-HOMEPAGE="https://www.mendeley.com/"
-SRC_URI="
-	amd64? ( ${MY_P_AMD64}.tar.bz2 )
-	x86? ( ${MY_P_X86}.tar.bz2 )
-	amd64-linux? ( ${MY_P_AMD64}.tar.bz2 )
-	x86-linux? ( ${MY_P_X86}.tar.bz2 )"
-
-LICENSE="Mendeley-terms"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="bindist fetch"
-
-DEPEND=""
-BDEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwebkit:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-"
-
-QA_PREBUILT="/opt/mendeleydesktop/.*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.8-libdir.patch
-	"${FILESDIR}"/${PN}-1.17.8-qt5plugins.patch
-	"${FILESDIR}"/${PN}-1.17.8-unix-distro-build.patch
-)
-
-pkg_nofetch() {
-	elog "Please download ${A} from:"
-	elog "http://www.mendeley.com/download-mendeley-desktop/"
-	elog "and move it to your DISTDIR directory."
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}" || die
-
-	if use amd64 || use amd64-linux ; then
-		mv -f "${MY_P_AMD64}" "${P}" || die
-	else
-		mv -f "${MY_P_X86}" "${P}" || die
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-
-	# remove bundled Qt libraries
-	rm -r lib/mendeleydesktop/plugins \
-		|| die "failed to remove plugin directory"
-	rm -r lib/qt || die
-
-	# fix qt library path
-	sed -e "s:/usr/lib/qt5/plugins:${EROOT}/usr/$(get_libdir)/qt5/plugins:g" \
-		-i bin/mendeleydesktop || die
-
-	# fix library paths
-	sed -e "s:lib/mendeleydesktop:$(get_libdir)/mendeleydesktop:g" \
-		-e "s:MENDELEY_BASE'] + \"/lib/\":MENDELEY_BASE'] + \"/$(get_libdir)/\":g" \
-		-i bin/mendeleydesktop || die
-}
-
-src_install() {
-	# install menu
-	domenu share/applications/${PN}.desktop
-
-	# install application icons
-	insinto /usr/share/icons
-	doins -r share/icons/hicolor
-
-	# install default icon
-	insinto /usr/share/pixmaps
-	doins share/icons/hicolor/48x48/apps/${PN}.png
-
-	# install documentation, but no license file
-	dodoc share/doc/${PN}/Readme.txt
-
-	# install binary
-	python_fix_shebang bin/${PN}
-	into /opt/${PN}
-	dobin bin/*
-
-	# install libraries
-	dolib.so lib/lib*.so*
-
-	# remove qtconf and qt-5.10 workaround
-	rm lib/mendeleydesktop/libexec/qt.conf
-	rm "lib/mendeleydesktop/libexec/QtWebEngineProcess --type=zygote --lang=en-US"
-
-	# install programs
-	exeinto /opt/mendeleydesktop/$(get_libdir)/mendeleydesktop/libexec
-	doexe lib/mendeleydesktop/libexec/*
-
-	# install shared files
-	insinto /opt/${PN}/share
-	doins -r share/mendeleydesktop
-
-	# symlink launch script
-	dosym ../mendeleydesktop/bin/mendeleydesktop /opt/bin/mendeleydesktop
-}
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.19.5.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.19.5.ebuild
deleted file mode 100644
index 5daa682e978a..000000000000
--- a/sci-misc/mendeleydesktop/mendeleydesktop-1.19.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit desktop python-single-r1 xdg
-
-MY_P_AMD64="${P}-linux-x86_64"
-MY_P_X86="${P}-linux-i486"
-
-DESCRIPTION="Research management tool for desktop and web"
-HOMEPAGE="https://www.mendeley.com/"
-SRC_URI="
-	amd64? ( ${MY_P_AMD64}.tar.bz2 )
-	x86? ( ${MY_P_X86}.tar.bz2 )
-	amd64-linux? ( ${MY_P_AMD64}.tar.bz2 )
-	x86-linux? ( ${MY_P_X86}.tar.bz2 )"
-
-LICENSE="Mendeley-terms"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="bindist fetch"
-
-DEPEND=""
-BDEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwebkit:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-"
-
-QA_PREBUILT="/opt/mendeleydesktop/.*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.8-libdir.patch
-	"${FILESDIR}"/${PN}-1.17.8-qt5plugins.patch
-	"${FILESDIR}"/${PN}-1.17.8-unix-distro-build.patch
-)
-
-pkg_nofetch() {
-	elog "Please download ${A} from:"
-	elog "http://www.mendeley.com/download-mendeley-desktop/"
-	elog "and move it to your DISTDIR directory."
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}" || die
-
-	if use amd64 || use amd64-linux ; then
-		mv -f "${MY_P_AMD64}" "${P}" || die
-	else
-		mv -f "${MY_P_X86}" "${P}" || die
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-
-	# remove bundled Qt libraries
-	rm -r lib/mendeleydesktop/plugins \
-		|| die "failed to remove plugin directory"
-	rm -r lib/qt || die
-
-	# fix qt library path
-	sed -e "s:/usr/lib/qt5/plugins:${EROOT}/usr/$(get_libdir)/qt5/plugins:g" \
-		-i bin/mendeleydesktop || die
-
-	# fix library paths
-	sed -e "s:lib/mendeleydesktop:$(get_libdir)/mendeleydesktop:g" \
-		-e "s:MENDELEY_BASE'] + \"/lib/\":MENDELEY_BASE'] + \"/$(get_libdir)/\":g" \
-		-i bin/mendeleydesktop || die
-}
-
-src_install() {
-	# install menu
-	domenu share/applications/${PN}.desktop
-
-	# install application icons
-	insinto /usr/share/icons
-	doins -r share/icons/hicolor
-
-	# install default icon
-	insinto /usr/share/pixmaps
-	doins share/icons/hicolor/48x48/apps/${PN}.png
-
-	# install documentation, but no license file
-	dodoc share/doc/${PN}/Readme.txt
-
-	# install binary
-	python_fix_shebang bin/${PN}
-	into /opt/${PN}
-	dobin bin/*
-
-	# install libraries
-	dolib.so lib/lib*.so*
-
-	# remove qtconf and qt-5.10 workaround
-	rm lib/mendeleydesktop/libexec/qt.conf
-	rm "lib/mendeleydesktop/libexec/QtWebEngineProcess --type=zygote --lang=en-US"
-
-	# install programs
-	exeinto /opt/mendeleydesktop/$(get_libdir)/mendeleydesktop/libexec
-	doexe lib/mendeleydesktop/libexec/*
-
-	# install shared files
-	insinto /opt/${PN}/share
-	doins -r share/mendeleydesktop
-
-	# symlink launch script
-	dosym ../mendeleydesktop/bin/mendeleydesktop /opt/bin/mendeleydesktop
-}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 71452f95b51c..463dbdc3fd61 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index 024fee041e2f..e9fde13cd5d0 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,8 +1,10 @@
 DIST tensorboard-2.1.0.zip 3835182 BLAKE2B c2c7dbc1ba4b85c52df6e693e1bd425bd76fe6db7ca25582b57d9c65c68b191dcdba2623ab0560139f1cac1bdf5c7a47261daaaf51fca46f2c5bf441f832a6fd SHA512 7463ace0863b90312a62a7fa96f4eca0147e85cf46ff21729f8996a794d54e14d876d3abe083d6aa4efd8e4e1582f7d5029de367f199981a34d4057b558bc51c
 DIST tensorboard-2.2.1.zip 2950617 BLAKE2B 487ad01981f994b23cb5fca8b60d9ed5f13ba13735d2613d1f3154eec9791b4b3068fb9fd50e75e16682e09ceb8a9ed8533ca2c43b6dea73db3adaeef15a889b SHA512 e96f8853d282dc19911cf2210ece0a4d7239f37dcba82e91697c80881fbcc21f12e4ba3e7d2eea7a84c9bb5b6521bf488d93d2312e55af9ec2d2c20f135d94fa
 DIST tensorboard-2.3.0.zip 6789437 BLAKE2B 34fe0ac903f6b79fc1ddebd2fab3d64e48a4ef9bb6159494e6b3ec5444ab6ad339f5ca7e4e478ec03dc7a788bbce6a4bd3ce253640136079a7a470f01f7b3a48 SHA512 d4cfdc8dbf030c022ecd635249f643d158c92274b142cd3de93cd8877c47cf59b9aca9aab12a971b986b84c7396bed3d7a012837b08d9dee6b0e53dc56e9fcbe
+DIST tensorboard-2.4.0.zip 10631832 BLAKE2B e892c3f62855bd900320adbbea2758191296e2863e8865f4ffed3c5623fe5273a5a26554504b63db58c60d2a8c407e234d6cf3edc3868c88dfebd894def99859 SHA512 2301f526a98ac85cf5d182fff0f565c86883ec795bbaf2322696416621c8473d850a3f508079f89ca2a86a05fe020acde1282b72e2bb5ad77aab2d0e5ea2db4f
 EBUILD tensorboard-2.1.0-r1.ebuild 1838 BLAKE2B 777ceecaa2c901ee2c834b34b774d0c193b733e9ec3becfa6c07ee8b96bfe8a93abd5c1826a5ed38179a8bfcbfca2054a863e5f10d31822c0d7056669a5c4faa SHA512 1fcba112f887cfcb50adb7c396533da455f47413f037563ea6692227bcfc70767900219856a6574cec8e9c1efe6b04d84aef0aeee8c77113ee7424303ada7e0d
 EBUILD tensorboard-2.2.1-r1.ebuild 1946 BLAKE2B e67025a996ecbe523410775da621b4f741fc5b514474cd24dfea0ab7428411550f56c39b42c7f5b2e25adc466008bd664ed84519e1ea069dbcd4f2731e90f3ac SHA512 6a9c8f80e9a34adcc5ccbbb4535c9855e2818cc1fc46a04d6f801ef99241d856d81f77bf4c83c0e807653854ba218d33df7d67718d8c3e25f0b9d569856ed78b
 EBUILD tensorboard-2.2.1.ebuild 1944 BLAKE2B e0503f8c67624893eb16d97cfd36f0734f1db44526391cba62b7a664f1d4e4189519547904f706d8d03024ed47c45d5d0183b82f56df589cb43347c335f03db9 SHA512 29cd974fe3c4d0fe767838b60e198ef5cb553d3596f6f02afcea4eb56ee4a6a37d91e6f3f73cf77b1a4059037ec709cbf9917b0202794dd8dc7b200f9c61fe56
 EBUILD tensorboard-2.3.0.ebuild 1946 BLAKE2B e67025a996ecbe523410775da621b4f741fc5b514474cd24dfea0ab7428411550f56c39b42c7f5b2e25adc466008bd664ed84519e1ea069dbcd4f2731e90f3ac SHA512 6a9c8f80e9a34adcc5ccbbb4535c9855e2818cc1fc46a04d6f801ef99241d856d81f77bf4c83c0e807653854ba218d33df7d67718d8c3e25f0b9d569856ed78b
+EBUILD tensorboard-2.4.0.ebuild 1946 BLAKE2B e67025a996ecbe523410775da621b4f741fc5b514474cd24dfea0ab7428411550f56c39b42c7f5b2e25adc466008bd664ed84519e1ea069dbcd4f2731e90f3ac SHA512 6a9c8f80e9a34adcc5ccbbb4535c9855e2818cc1fc46a04d6f801ef99241d856d81f77bf4c83c0e807653854ba218d33df7d67718d8c3e25f0b9d569856ed78b
 MISC metadata.xml 494 BLAKE2B 367959e934fdf8e447da9632a05ea0ada6116a7c39cf42096a3b24f0dcf0c0bfbd3263e6f3913611c27e76f629b77d1e5022fa124d7e79f03a224bd3627bb538 SHA512 b59bedcac4e07ddbb62e90df57670116ba51c3d8c6294679ba5d8f17d7adbf3644f3d203c1d1ef4fa06d7e50640148ee259a081afb807477784350b98c52da11
diff --git a/sci-visualization/tensorboard/tensorboard-2.4.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.4.0.ebuild
new file mode 100644
index 000000000000..9d1a93563347
--- /dev/null
+++ b/sci-visualization/tensorboard/tensorboard-2.4.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-r1
+
+DESCRIPTION="TensorFlow's Visualization Toolkit"
+HOMEPAGE="https://www.tensorflow.org/"
+SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/bleach[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.6.3[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-oauthlib-0.4.1[${PYTHON_USEDEP}]
+	dev-python/grpcio[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]"
+BDEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	eapply_user
+
+	rm -rf "${S}/${PN}/_vendor/bleach" || die
+	rm -rf "${S}/${PN}/_vendor/html5lib" || die
+	sed -i -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' "${S}/${P}.dist-info/RECORD" || die "failed to unvendor"
+
+	find "${S}/${PN}" -name '*.py' -exec sed -i \
+		-e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \
+		-e 's/^from tensorboard\._vendor import bleach/import bleach/' \
+		-e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \
+		-e 's/^from tensorboard\._vendor\.bleach/from bleach/' \
+		{} + || die "failed to unvendor"
+
+	sed -i -e '/tensorboard-plugin-/d' "${S}/${P}.dist-info/METADATA" || die "failed to remove plugin deps"
+}
+
+src_install() {
+	do_install() {
+		python_domodule "${PN}"
+		python_domodule "${P}.dist-info"
+	}
+	python_foreach_impl do_install
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 38b71268fa1b..0a0cc24c77b1 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 7d7d1cf402ff..5a20caaa097c 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -3,5 +3,5 @@ AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee9
 DIST moreutils-0.64.tar.gz 92741 BLAKE2B 3e014a18a3b7615bcd83fd9b0a1e3010a059aae154395c2c1158f57634fe83c27503dc3aff1e116743cf80fc73ee2063ea60b03d4bece4119b962669095c71dc SHA512 94f131b9b02a8c1139dfe34abacab022687f51413c529288f57fa876676c028e200324ed855b910a7dbfb4290eb8b38b3dc182eda49988f521a550162b0a0eec
 DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
 EBUILD moreutils-0.63.ebuild 1506 BLAKE2B 279f0854c3238f533262718720f4e7cdccd69ea46b95095e81787f982418910384de1c202cf6be8404ef657eb1eba6fa60ca8df535a6c594f93c0ccb75b57394 SHA512 fce87829894fb3c5f55e82563568a280c010237e8fb011f1528e5e7660dbd421b2eced669a6ac9458e1eb62fd0041bb488d88f7a0bcbe8a563f688451749bd8a
-EBUILD moreutils-0.64.ebuild 1670 BLAKE2B 74f5df891e9f5e25124741c506375ab99eee21f76c7fe43521982c75a1c77c592a121155e12f5525528998364798fece7af90e1c05dc16f544a8274a07d3e3b6 SHA512 83bcf0e5f1127a94dd99174b77307ead201eaf6db85ca96c1bee3f7084f2f8215460a1bb923b2f14fe30ac29e70fc9451972e109170318a5a4141a257b2744e7
+EBUILD moreutils-0.64.ebuild 1692 BLAKE2B 83d6a26ec6dd356f2a2a1613ded2c63847077b2c88e4153e725451cb25ec7f79c184736141c667112b8f46da2608535692882dff16cb269776be894131f4f0e5 SHA512 51bf783fac4952b980d89d73b239a6f098b6bc85cb8a1f97ff871e827370069d29ca42bd2ef5ba3db8ea22b257f581da0a9ab592aeb4f4d7e6e49bc860be2c7b
 MISC metadata.xml 313 BLAKE2B d0cd446eb7516dec44ac4eb8a73d268652317a7dd1b3531f9e69341ae5a768a2dbc554fb577d499d139a684d190c400c08b5a14023c1a0db03cc599321c651e5 SHA512 07345c6cea216cf9e7043eab1a33cdc9bd9bf52adb5a4019afa401faddfbf0129f2297d01e2a9595cf9963e55ba53c4496b7ab79a9c33be85fac18ca60220a3f
diff --git a/sys-apps/moreutils/moreutils-0.64.ebuild b/sys-apps/moreutils/moreutils-0.64.ebuild
index dced88e9895e..e541ca91e98e 100644
--- a/sys-apps/moreutils/moreutils-0.64.ebuild
+++ b/sys-apps/moreutils/moreutils-0.64.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
 IUSE="+doc +perl"
 
 RDEPEND="
@@ -51,11 +51,11 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-	emake CFLAGS="${CFLAGS}" DOCBOOKXSL=/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
+	emake CFLAGS="${CFLAGS}" DOCBOOKXSL="${EPREFIX}"/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
 }
 
 src_install() {
-	emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
 
 	# sys-process is more advanced than parallel from moreutils, rename it
 	if use doc; then
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 88f078af3a24..68969d228374 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,5 +1,5 @@
 AUX pkgcore-0.10.13-metadata-xsd.patch 750 BLAKE2B 93a75ca69597422da66b42aed94e0ad67b1b80802103b90b4306c8967ea5d1723860b9851085186e078c50e3c222cbe8a78bc0fa071ed7c0cf85b4218920f4dc SHA512 d2f2f16167b9d2c32b80783b4d21d04e47328209b3ccff24c057044286ae8896fb3205ec103edbe1f6fd5e20c4ed7871bf3c27b1fc134e8299c76b7ff86ba33b
 DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
-EBUILD pkgcore-0.10.13-r1.ebuild 1135 BLAKE2B e6f41330ff8765fd4fdb3462def38de978469f9fa91f0044fd3722aec4cb681e741c2d4890b302a19bc9a825b37ea2f5277bd2b806686ad304ef8963ac11dd9f SHA512 0419a6f60d21d57bbe568b6a5030ea5e01f5a0bac128d672872abd4c01e27e7b6cbaa79fbad44234113a0a449b392472bc06a783572d8ad7b8c844f696b27847
+EBUILD pkgcore-0.10.13-r1.ebuild 1146 BLAKE2B 1b94b7836087ace2e4b5a3b366a97fc42bfda6de298d8db11a54c6b495c4c9f22b41d56e1c8d15a51cb3dca0fba0428ae23f93c3248b624f371e7c1d90fac034 SHA512 b9347581bf17afbaa09a57cea1a9a161d837fe64d430754d3579c6ec1844e5cda273253f52feca4a80e3fb5607e91c8d01b2646a3ec3903811bbd47d8f3520ea
 EBUILD pkgcore-9999.ebuild 1083 BLAKE2B d0c3f82381d3034f8b522f44c5c83d0437ea855a00c0ba8ab6f3f9ef066277b81b7664f07c2a4761d4293f7e6b14be9906945fa371ab40c8a4d6d3debeb53b47 SHA512 7262ab79c9418428103b97b8065069d2db1e8813a7f59a3a0d9a55c353931f85eb12814636305246936f3032bb6923a683c3f1d6608848e04f63b188d3a61885
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
index a83f747b80ae..d09a6d18bd3d 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index da2eea57f58f..d1f0c36662d9 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,11 +3,13 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 DIST portage-3.0.10.tar.bz2 1048234 BLAKE2B 9011c7a3a7ea6c5c78190c5344370d26700e4bf95e56fdf7036c3c4e1ef2e8bf691f5ee21142aaa4e15d5798404e5abadfdb2b5fea288451666840f0adb0ef77 SHA512 d5823fa263876350f5128e03c92350a90f665a5539e0eeea1cfb9320a1c83cfdffe91315bfa54dbc1ba6ffb42fdcbda3b0b728f79aaf3ef254ebb7fd09563188
+DIST portage-3.0.11.tar.bz2 1048734 BLAKE2B d52e6d90750da0a2474e7b0071955111382aaf14d0c464bd66e673fc953ee90c2a426bd2e05b3642339483184a390ba416b2024849779d0fd95172d383ad4851 SHA512 048f7df9f2748565b8cc258667d1ea8fe0cd5e2dbea58d70ce9670885ba00949c16f9c5e7d2c3b2f795fd8f1d977792a9cb083613376128d33bdf9c1e1e4a8e9
 DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
 DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B 662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666 SHA512 5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85
 DIST portage-3.0.9.tar.bz2 1047839 BLAKE2B 44cf96ac69c1b6d2f95aea8b6e87af5665bfa797ef97d3ae09d4faeefa5b36671f542a5bb8b141b0d914afef96d536a63da4539d27336471621363008d2f73bd SHA512 01ad255a12381fb3b52a8d6c1b04cb377c52b8856973aa296a1086f2d89dd6458244486a0d477e95d4247c3edf7e8e3bb20523263979401443b212085737e618
 EBUILD portage-2.3.99-r2.ebuild 8482 BLAKE2B 9880361867a65a42c22b277e46fdf973d32b57679519dcce4728fe3297a6b55990a0cc319e161f3056f33c72979101e9b54168e01ef6a1a2bfdc6a92df042821 SHA512 c04cf3569d920a4e55da0eac94cbf93b5780d9b2eb3afa45c918fbae88c11a0f130aba4370b1897628a0f03fd24dcf573aad03164c4e9a786ec754f96cd0939d
 EBUILD portage-3.0.10-r1.ebuild 8627 BLAKE2B 305994b05147a9e3fd5c8fc8f4281c23f356371dd8bd016f7976e0411da6f55d7b37cd6bff0f3d2e6c05cf7ae3f6d6e58c1f1ee6d7256d4933992b713b3a3118 SHA512 92679a639c18d00b38f9dae80e07641e5c78801111ac1a9b8f0e99f226ecd4fa1453417a9da4c6468412ad783683edbf84c63fcef4cc63dfc3da6f3d2ad21b26
+EBUILD portage-3.0.11.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
 EBUILD portage-3.0.4-r1.ebuild 8527 BLAKE2B 631108e364ee22d284e334c5c641f4e807375ac75804a7c3099837d94a74f4c41cbbaf6ca365624516f858ee68c07b8551a3c1c9f1950f6352d0186db4bd28c6 SHA512 8ff2a857a31c283408b9d8a6f5d1a984c6299ccd1b7f8eaaff2e3b5f3b1dcc62f32bee8dbc1496a4a75e836f4772f91a295a23facb005d035c337032ed63d6a1
 EBUILD portage-3.0.8.ebuild 8379 BLAKE2B d2c21e67e7e182c79c0435033dcafdef239a28d4108a953a74839bd6cd8fc83076bdd324f35cc2d64028c13f6a9b4bbb6a725b3f797be035e1a0710f07a9e980 SHA512 b000f7461b73ea27b71e228df180f7cca078890d93a89f8c835986e49eba31d9faa1b6ade34db6aa9e35a4fb9cfed05eb104611e9952dbbd6f99cff41f75b850
 EBUILD portage-3.0.9.ebuild 8378 BLAKE2B 6d286cf9502773ffe070393836d1bb524e1e7ab5ae23106f1bebd4b1e407ff674387681bc9134e03439f8ef0b6d95fe5fff4855d4df07227eb60e19d522eba62 SHA512 0274d6dabbc5d1cc25bee61483a53d6e5088a432984a8961f3631f010aada1e55082d766f180eeb5acf251c3d5f834957e24120c62bd19e2ceee328ab40818f2
diff --git a/sys-apps/portage/portage-3.0.11.ebuild b/sys-apps/portage/portage-3.0.11.ebuild
new file mode 100644
index 000000000000..28cd3d04cca0
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.11.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info tmpfiles prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-vcs/git )"
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	env -u BINPKG_COMPRESS \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index dceb3e6dc611..e1fc89782dc6 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -3,5 +3,5 @@ AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f5477
 AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
-EBUILD systemd-tmpfiles-246.ebuild 4485 BLAKE2B 23af3c77dec65abe104e3b3a6c094194181dde0121b7ffb86b23085bab5cd1c1fd16b7ccf6facfb20ad149a11e7235e85d20fc8b7e89572da0815a1e5bdcc353 SHA512 53197d3537a783ecd136ebf482886596ffc00f6daf36b11395be9ef6c097b7be649f4fdd8608cc1814b90b34fe8b4b8990246f79beac09a9de8e7a5df539aa0b
+EBUILD systemd-tmpfiles-246.ebuild 4491 BLAKE2B 17124a80e29a2211b42ea9d059bb8e45c6eadc7c1cd04d3bd25a263534f31cb6b7e942b294f55f68c558d5c56c7c9e531de11ee761cf89c77ab645660f35e273 SHA512 289624de6d5eaf333273969ad1fd82785fc17ac56a31b11e69857f264455acf00413250f0146de3337e34a24f2aea9ed88d4f862dbe19305742c3bc9459bba25
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index 1aa64e928f2b..99967bb12780 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 1a55b9bc5b33..b8b08eea3b00 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index cc91493bcc1d..ee3ea98d23e0 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -23,5 +23,5 @@ EBUILD galera-26.4.2.ebuild 1887 BLAKE2B 3cfcc688d2211a780d74e8c1001abb560c49903
 EBUILD galera-26.4.3.ebuild 1789 BLAKE2B 457e551c47e4711a1c4420aa667a4d949b386bac6942b9c20dfbc577d6158db07b103e542daaff2e71c3233d61a99921ab20d5bf901e7b10a543aeb880af1495 SHA512 78e370cee168728221740f984907f987c5c5f84a889e5ea62406bee503b8bd5638c2d3d1057dbd220f2a195f971fe91696e6f6e72d0f709df1fca3c5567e9660
 EBUILD galera-26.4.4.ebuild 1836 BLAKE2B e2fc171232d64252c1e4647c34d1bde5c37e326042d883515dd43ecd4b6722c23e669a8fd8a720941e75065239db8a6faa838f4727aa95288bdb1b70c09d0c6e SHA512 a8fef312f762fa23558da417d3463c1a9e1e4ce71dedbce4c6d0eb02d9f2fd1ebcda71e4fbd3dfeb0c0778d3a4adb60c954771a537278b7667945ec9fdcf9c94
 EBUILD galera-26.4.5.ebuild 1886 BLAKE2B 4a98c96e37676c0348581a6090338ec97b90915f4599aa3d001d2f866a26450dec5543ce82b818d144d3697ca4ba88f773fa7f9df8d7054310760a2bd5f5a674 SHA512 2b55cb4aa102aa713eb23ee2348b0fc92d82028d30920b6765155e6ff613ef8664e0f72d8c1e830bfd1cb5609c614ad6eaa9a50ec0a5748f101d5a0865408d0e
-EBUILD galera-26.4.6.ebuild 1885 BLAKE2B e3141f734bc6ba80b88c282c648f42e003c977e89be303d495fb114a88c869bd5c2745b2c9df6722402abb4a972518352d4b7f88a4818157f1da918b0693b4e5 SHA512 3be1b09df6441978ca734aa0fe62caea21bb47203ba881dd72569fda16f1bf91cd9c9bba418801f2387cb0fc3b9aff1eb317dcd9cdfc2cb7d54237d035eadef3
+EBUILD galera-26.4.6.ebuild 1884 BLAKE2B 11c0316dc2096c4d0db1ac5a93bacd80f28b200bf72a6f3afa139b6f9368bb57ffcc7d0d0f20d55f0f7fdb103228c9f16557c4eea6ece46d92de1a890f484a57 SHA512 5c31b2332101f7d4ebef37e26cf987588884b179e555b72cc53b29c1f80d1172ddc4f5c7f911940e00367f2b594fcc3a59676c28e85d6eea5162188662de83ba
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-26.4.6.ebuild b/sys-cluster/galera/galera-26.4.6.ebuild
index b459d342ff13..5043129e75d8 100644
--- a/sys-cluster/galera/galera-26.4.6.ebuild
+++ b/sys-cluster/galera/galera-26.4.6.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 3d2d05fa1fb9..a07fb18b1408 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 7ec06a66c90c..12723253f372 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-common-10.0.0.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 EBUILD clang-common-10.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
-EBUILD clang-common-11.0.0.9999.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
+EBUILD clang-common-11.0.0.9999.ebuild 514 BLAKE2B dd8058f909f17d35a5e9ab159deb59a3da7e661fa6d40be244c9cd929a3005bd4f735a1b55759abcbacafd59c293e67ff7941509cd8337676894697c9fea962b SHA512 18f121cffa794264804a55f4db73f3dc1a9a65818c3e5f760ad4ba86706a236c3a382749d9d3ed7ff2820752139ec26524d0e9b715515e100de3c1cd79bd49b1
 EBUILD clang-common-11.0.0.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
-EBUILD clang-common-12.0.0.9999.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
+EBUILD clang-common-12.0.0.9999.ebuild 514 BLAKE2B dd8058f909f17d35a5e9ab159deb59a3da7e661fa6d40be244c9cd929a3005bd4f735a1b55759abcbacafd59c293e67ff7941509cd8337676894697c9fea962b SHA512 18f121cffa794264804a55f4db73f3dc1a9a65818c3e5f760ad4ba86706a236c3a382749d9d3ed7ff2820752139ec26524d0e9b715515e100de3c1cd79bd49b1
 EBUILD clang-common-9.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-10.0.0.ebuild b/sys-devel/clang-common/clang-common-10.0.0.ebuild
deleted file mode 100644
index 636965492422..000000000000
--- a/sys-devel/clang-common/clang-common-10.0.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
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
-llvm.org_set_globals
-S=${WORKDIR}/clang/utils
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-PDEPEND="sys-devel/clang:*"
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-}
diff --git a/sys-devel/clang-common/clang-common-11.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-11.0.0.9999.ebuild
index 18e41e0917da..1c9ca4dbe647 100644
--- a/sys-devel/clang-common/clang-common-11.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-11.0.0.9999.ebuild
@@ -7,8 +7,6 @@ inherit bash-completion-r1 llvm.org
 
 DESCRIPTION="Common files shared between multiple slots of clang"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
-llvm.org_set_globals
 S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
@@ -18,6 +16,9 @@ IUSE=""
 
 PDEPEND="sys-devel/clang:*"
 
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 }
diff --git a/sys-devel/clang-common/clang-common-12.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-12.0.0.9999.ebuild
index 18e41e0917da..1c9ca4dbe647 100644
--- a/sys-devel/clang-common/clang-common-12.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-12.0.0.9999.ebuild
@@ -7,8 +7,6 @@ inherit bash-completion-r1 llvm.org
 
 DESCRIPTION="Common files shared between multiple slots of clang"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
-llvm.org_set_globals
 S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
@@ -18,6 +16,9 @@ IUSE=""
 
 PDEPEND="sys-devel/clang:*"
 
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+
 src_install() {
 	newbashcomp bash-autocomplete.sh clang
 }
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index b0655025d4b9..0c9749583c70 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,4 +1,3 @@
-EBUILD clang-runtime-10.0.0.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
 EBUILD clang-runtime-10.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
 EBUILD clang-runtime-11.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-11.0.0.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
deleted file mode 100644
index 04d3897324e8..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-10.0.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
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 4d6d90df97e8..9c3609303185 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,18 +1,15 @@
 AUX 10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch 970 BLAKE2B 564394bea7e9d5a056e7ce39b3e5261f1214637084c1669d34e4d9c3296582732765654ccc2dd76507df2d7fb8406da4185339134fa52bb5c38a2335a55b4f50 SHA512 41050092b31b2558b2d24665f4b5b5bde8b7d50b979c21d57c6e59119dcfa95c3616b873214a8e986268a20436c0895b702547adeb44d6d7576c89de1ba2d587
 AUX 8.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533
 DIST 10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch 23184 BLAKE2B 42bfc9401bceea6627703f7611aafe4708e4e745e47e8caa01fb8c7126524ef65e4c135cfd0541bc663bfc52fa8c47342f7f8de462abe283ec353b068d2e3532 SHA512 9561c9ab6dc62257b7626f7898afa667401522817ec57137641f8687549b0b8e531659a5afd5226dd7619126cc67f68235f628cbe639345277415343c4ca3650
-DIST llvm-10.0.0-manpages.tar.bz2 177084 BLAKE2B 16b38e60fce4d67ac602b317ea7089c095d46b9426ba9940041e65d7ab493f85dba2e94a4aeba7b7c52042f23825efcfcd32a57d306aaf05b4307061a5a8a368 SHA512 eac57ad218ff4c2b5a74e453a29192ee6e911152b668d8a9420b59529d5cae8aa241f2485b4a7ea304acbecc7ecb27391a77552080726432c2b7b59b95fc0bd7
 DIST llvm-10.0.1-manpages.tar.bz2 180157 BLAKE2B ddf5951c8f5a2a8a80726fd713e6c818c852851a2261e904b484afdb67ac55f2ce10976ca2ca5d81fe2bf4806a72cc7b59f4068741306491a4f39065ca8fb56e SHA512 d3c2470dbd0f3143d64b380f7534ebcacdcf4bc4f140a6014283150007fe615ebd86247cf13b2432165a681614849e8eaab69a8d077f7a51e4e040e28ed33ebc
 DIST llvm-11.0.0-manpages.tar.bz2 179592 BLAKE2B d03dff5e7426f4c648d6112dee0fa7a91edf41584290c94c3f738fc65fa82fc6ef47b49c245fb0e741bdf267fc64534311194c476ece4b447649ba2250e61430 SHA512 1cf598f50c99a85a35b03398e4768cd1eafec9d602f788d401120adb91b3b59965216ed7102da26b7c2af7e1bbca4bca8f1d43bb687fcd8ed418e2f7076bdce4
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-10.0.0.ebuild 10366 BLAKE2B af2fc9f454038f9fbf552a217b8534d3c6fe74cac3bb58b167c96bdf3249e213dd64fc469a0f29f51a0dbf3e46c1dfdfdfb7680288df4fa13b21021d9a120102 SHA512 8e83ea9ff93c88c0d9fe3db936a8f2949413cab513ab675e936146130885ee26234174985e7616f1a830c9cb9c2b1c560f686570909115c4fbaccd7ba911ca28
 EBUILD clang-10.0.1.ebuild 11792 BLAKE2B cb044c8d17a8dbbe069acde03b2c91a8ea185f9a155b9d086c53a2b9c6e3730840f3122eaba006fa09e80c790ac00d0ba34d4def3e393850d8d4442a21a7b769 SHA512 3cc0f3ebdb0ca89fe201184bd7d7545a44a44969ed3142c2de7616e4ef6b120220323b90d62faf69a385e7426c08937661627db1434f1d6291032e50f7728097
-EBUILD clang-11.0.0.9999.ebuild 11494 BLAKE2B c02b255c4440b6c035bb52979cd4a14f1eb22264590b1f61a7f2d4a4ccd1ed79d768daef8264f91493f7a300ef75840a6f7aac55b7dfc4c5fd87b1af485afe96 SHA512 8a29ba42101bd3dfb6951a2947dc57945c24bd9276a8159ed82aec56fc432ffcab02db5fa9bdab744b1d73e1c96b49d02e520f7c451670ba051923b586eba62a
+EBUILD clang-11.0.0.9999.ebuild 11495 BLAKE2B 1e7e333ed10c2efe3242376026fb6dbd2e53ce6b395ef2ca7f7389db8306156120a52bf2c47fbbb458ebc88ef13b9a640d28c464adad25e40f609307101d7fb7 SHA512 43ecea696536405b77c08176aa41bef723aaff5d63f329d7a3c20582ae294fc8ab0b158a878489dbc98c62b5d1171a07535d834df0ef549218183cf76a95c296
 EBUILD clang-11.0.0.ebuild 11539 BLAKE2B fa949a59925b4e9d1044021a5b0346926c585056571bed6d66c720cd6c3a1e7a57f81e02132295a63346fa130a633eb7960d6cbb54c9cf2c0cf0cea96b1c6bdb SHA512 0ba29b7d29ad59b944540f324381cfb25512242c3e998d15fb62e5526dd6dc9625812562ef328a593cdf190d5a9bb8eafe4a922039aebe29aad4ae2e11fdfe0c
-EBUILD clang-12.0.0.9999.ebuild 11429 BLAKE2B 8403c223a3fdeb851eb6be9c190730101013f370f9d9172ac03a08e93d342d729ed453ca527ccdfb12750c71813f1a9cb0a23298a8db5fc9ab3c38b9b2fa6130 SHA512 141978ca93729ace58bb0973dd25a8560411523daaab3e404a7b11c1ccf6908eec08939054700f1d2e7b7e2493e85a141eaf7c3022e30134bc24c0f0ac5b96a9
+EBUILD clang-12.0.0.9999.ebuild 11430 BLAKE2B 1e2f3a8b3a611dedd281bbf7febada4a7255ded5a06ea4285adf4784107e130115e5f27871c120f44b1b3bde78236a900e6d81b3399e1a0b6b04275a5fc469a9 SHA512 5b7a7e1c9157fa95280e597f9310483705cc19e8a947704d3ad0b9ce2dc636ce94aa496881e332c22cdec38e355ec37d9c8e517fa8e45789059ae88137088402
 EBUILD clang-9.0.1.ebuild 8982 BLAKE2B 05319c777c4ecfd03a54bc9e14f322ad6f348a99554ebf8eb1e3a0a1b8c7aba5f3ba618fd3edb21022dd34f1cd4dca2c3f24b152b6f795b939a77c8959d27fa1 SHA512 f88f6c0dc7f1faed0f0d8310c9235a4d0d17352f710f28d9a8c7e47e28aaa43f7727e3e2a7e30334ffae7cb2e6df7769a543fd4c79a0ecb8a1f0a480b15fdb06
 MISC metadata.xml 1336 BLAKE2B aaddc1c1193323466a545df21dfa53b637c3edff4f61cd55037d8327273457cf8d35cad7b92a2eef31acfb055a3e1ed93cb53a913b01eddf43b7b3dc6de880c4 SHA512 0538198df449cdf4d0cd00cb50d7c6883b06524419a29c4376cdcaed440fb84cfbd4983a1a025ae9a6e2fc5d91a4870bfcde587c493d8b617baec2214705601c
diff --git a/sys-devel/clang/clang-10.0.0.ebuild b/sys-devel/clang/clang-10.0.0.ebuild
deleted file mode 100644
index 85fddbe285c7..000000000000
--- a/sys-devel/clang/clang-10.0.0.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
-	pax-utils python-single-r1 toolchain-funcs
-
-MANPAGE_P=llvm-10.0.0-manpages
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="
-	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${MANPAGE_P}.tar.bz2 )"
-LLVM_COMPONENTS=( clang clang-tools-extra )
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing/Support
-	llvm/utils/{lit,llvm-lit,unittest}
-)
-llvm.org_set_globals
-# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/clang
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux"
-IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
-	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	!<sys-devel/llvm-4.0.0_rc:0
-	!sys-devel/clang:0"
-PDEPEND="
-	sys-devel/clang-common
-	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	# create extra parent dir for CLANG_RESOURCE_DIR
-	mkdir -p x/y || die
-	cd x/y || die
-	llvm.org_src_unpack
-	mv clang-tools-extra clang/tools/extra || die
-
-	if ! use doc; then
-		ebegin "Unpacking ${MANPAGE_P}.tar.bz2"
-		tar -xf "${DISTDIR}/${MANPAGE_P}.tar.bz2" || die
-		eend ${?}
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			c-index-test
-			clang
-			clang-format
-			clang-import-test
-			clang-offload-bundler
-			clang-offload-wrapper
-			clang-refactor
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-
-			# extra tools
-			clang-apply-replacements
-			clang-change-namespace
-			clang-doc
-			clang-include-fixer
-			clang-move
-			clang-query
-			clang-reorder-fields
-			clang-tidy
-			clangd
-			find-all-symbols
-			modularize
-			pp-trace
-		)
-
-		use doc && out+=(
-			docs-clang-html
-			docs-clang-man
-			docs-clang-tools-html
-			docs-clang-tools-man
-		)
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# override default stdlib and rtlib
-		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			# normally copied from LLVM_INCLUDE_DOCS but the latter
-			# is lacking value in stand-alone builds
-			-DCLANG_INCLUDE_DOCS=$(usex doc)
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
-		)
-		use doc && mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=ON
-			-DLLVM_ENABLE_SPHINX=ON
-			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/clang-tblgen" ]] \
-			|| die "/usr/bin/clang-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-		)
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-clang
-	multilib_is_native_abi &&
-		cmake-utils_src_make check-clang-tools check-clangd
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	# note: we use two version components here (vs 3 in runtime path)
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1 "${llvm_version}")
-	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
-		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
-		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
-			dosym "${abi_chost}-${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
-		done
-	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake-utils_src_make install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
-	fi
-
-	# install pre-generated manpages
-	if ! use doc; then
-		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-		doins "${WORKDIR}/x/y/${MANPAGE_P}/clang"/*.1
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
-	elog "Some of them are vim integration scripts (with instructions inside)."
-	elog "The run-clang-tidy.py script requires the following additional package:"
-	elog "  dev-python/pyyaml"
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-11.0.0.9999.ebuild b/sys-devel/clang/clang-11.0.0.9999.ebuild
index a66c3ab97393..a228b39cd4d5 100644
--- a/sys-devel/clang/clang-11.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-11.0.0.9999.ebuild
@@ -9,14 +9,6 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang clang-tools-extra )
-LLVM_MANPAGES=build
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing/Support
-	llvm/utils/{lit,llvm-lit,unittest}
-	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
-)
-llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
@@ -59,6 +51,15 @@ PDEPEND="
 	default-libcxx? ( >=sys-libs/libcxx-${PV} )
 	default-lld? ( sys-devel/lld )"
 
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_MANPAGES=build
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+llvm.org_set_globals
+
 # Multilib notes:
 # 1. ABI_* flags control ABIs libclang* is built for only.
 # 2. clang is always capable of compiling code for all ABIs for enabled
diff --git a/sys-devel/clang/clang-12.0.0.9999.ebuild b/sys-devel/clang/clang-12.0.0.9999.ebuild
index a186693b4e0e..0e296111e066 100644
--- a/sys-devel/clang/clang-12.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-12.0.0.9999.ebuild
@@ -9,14 +9,6 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang clang-tools-extra )
-LLVM_MANPAGES=build
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing/Support
-	llvm/utils/{lit,llvm-lit,unittest}
-	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
-)
-llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
@@ -59,6 +51,15 @@ PDEPEND="
 	default-libcxx? ( >=sys-libs/libcxx-${PV} )
 	default-lld? ( sys-devel/lld )"
 
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_MANPAGES=build
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+llvm.org_set_globals
+
 # Multilib notes:
 # 1. ABI_* flags control ABIs libclang* is built for only.
 # 2. clang is always capable of compiling code for all ABIs for enabled
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 423e2417d396..ebb831874e79 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,8 +1,6 @@
 DIST crossdev-20200801.tar.xz 28268 BLAKE2B 36f22a2d1422d5f9e27a5559a8c141462853c4dc011ec98c66d235ef262ea9408fd5054b578963fd17ef630ea63e72c068d216f6ffbea7d191d1374a6ecc4033 SHA512 331af1525cdfc66380621b764bfc63178ce962b9071408d1ee08480caad9c0e4782a8fa5e5f3500fd2ea03ccd322895cc95d80106ad9e5b97a0e09ef5d88c94b
-DIST crossdev-20201108.tar.xz 28312 BLAKE2B 2fe86fb7e1b9ed8a3986efcee9bba06a810cf03f00496eee49870e0a9c0a589b8ae461811bf83c76dd22c59e344ddacaeab2ae215aa8f58f3b2e7490399528fc SHA512 28cf1807845c4cc4291c8d576119dbe362ea0f31504ae7a96dbdee636033eab511004b0a8988c4d7425017c3f281b6afa1644db4f9f310a08d69fd7fcd6cdbe0
 DIST crossdev-20201122.tar.xz 28308 BLAKE2B 66da19024dd03e98ff0f388cdb9bf76a968ef4ac920249e9a782d46c1d32a4cb3047a0aa2d9619a054b9894ef30624ce99bb45f9c45b937fbb280a8a298aede8 SHA512 bbd7ab6a8ea0d2cb13f822277d9b8c19478368b2f365aaa60bd2548b47f9e7a582805593b683631ebb20bfb6d2f496f2d3a5eb6d144207fab58607565a8d1a41
 EBUILD crossdev-20200801.ebuild 841 BLAKE2B ae015c955b8fae5c400e230ac248395694eaa2ca7653fac637736c577474d55ada854d17709c737340b5982678e4082fbee79b532a41c3f3cf8d0e50ee420c68 SHA512 4cd58d6bd14cd82397ba515aa7ecb04c48fd6be1a9f1d6d26ac7bf9ebc98aa43ca6106e45f149dae1b98cb142eaf949e558365d11f66669bc972de005514eaf5
-EBUILD crossdev-20201108.ebuild 850 BLAKE2B 9992fd02501d3d876f48abb32d8be5a1c6f5842782363ea098a972903c7ae46f92297fc19c50418a7d31087b63ae5b75fea0a974cc1fa0cde7e4cb86446f678e SHA512 5f4d1c246f7bc192d69ee404fb8014efcc0ed52ce6af4cbf0c89d3d287c5c79c4b6dbf922f54cab975c56c8d66035dda1f78dfd39d8e1fa65f59136278179fd9
 EBUILD crossdev-20201122.ebuild 850 BLAKE2B 9992fd02501d3d876f48abb32d8be5a1c6f5842782363ea098a972903c7ae46f92297fc19c50418a7d31087b63ae5b75fea0a974cc1fa0cde7e4cb86446f678e SHA512 5f4d1c246f7bc192d69ee404fb8014efcc0ed52ce6af4cbf0c89d3d287c5c79c4b6dbf922f54cab975c56c8d66035dda1f78dfd39d8e1fa65f59136278179fd9
 EBUILD crossdev-99999999.ebuild 856 BLAKE2B 8ec9e78dc63a9bdf766b1010b0953b7da86c164f221fc31058dc0e02e160091241d68d38b75f155bd8c55074019f626e9b0c272899574927f7aec9560207e357 SHA512 bffbd553b032998e649c5b505d1e7758d06d7b6f8b9d25487c8d034884dbe01259585597f731dee3e10a0e3d7bbc2ecab606ae2612fac7e46b03c91f74778490
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20201108.ebuild b/sys-devel/crossdev/crossdev-20201108.ebuild
deleted file mode 100644
index 809478863946..000000000000
--- a/sys-devel/crossdev/crossdev-20201108.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
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 2c38266738d4..6710a27ca100 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lld-10.0.0.ebuild 1478 BLAKE2B b91fbc24f88a6365b543ef20b6e80398545e921bf0ea8431a3b450a77cf1fa637506513d43d023b25a665a2a9324582e78adbce0df709f237b4e8a542181fa02 SHA512 8b45bf02033c78110eef573a2d7018972527637352bf097166f7a8fe6966fea9cf934e22f7aee62a9390e859d28fadca1c74dd0bc87874d0d5a3d6a720caef82
 EBUILD lld-10.0.1.ebuild 1327 BLAKE2B 1c55c1e99e5e8bedbc1e3ab1b8159ee04e9128f7ddecc2fcb1800e12c62c1543cf16f9fc016eada3773c263f7a86c5199ead1f75d28db9126c6df3de6a9f0fba SHA512 9d22766d1b5915fade4ed73e1a5ba1eeb276d1cca640ba13d76502cf58025e03a96c4c162bbdfa328a29bc612d954771249300fe4724614b910b97f5313693c3
-EBUILD lld-11.0.0.9999.ebuild 1364 BLAKE2B 8d5960b7882b7fe2cfcf00c2dbfd15b04ae9e65757ee0704fa98b96d56a7e80550a953e18650a5ae8ab9c644e18690a8190e078672e328af3426b1d2b0131ee7 SHA512 2323c716189ae9741c83afb4ae3c20cdb23efc3538fcf968581b6f40a0612cd64bb1d324ac20548e27e133e633e990f51647f3d8dc4252208bcd5d69bf0aa59a
+EBUILD lld-11.0.0.9999.ebuild 1367 BLAKE2B 63a086f319f38c76f13fa2b2a9b61e42c42bf86c519f592161ff4a1575145720ddaaf44482caa38fc762ab1580e15baef9ce23a5ce6675e9f6133af204acf243 SHA512 f47feac0acc03f9f2aaa5cff60a5921a0ee2a71d736b40718f2a2c5cf66a94bbb445c4506cc04761b0f8b27f487d8bf9af92c9eef70a484fa952aff4ab802505
 EBUILD lld-11.0.0.ebuild 1389 BLAKE2B 6d821d200a2a8bfc09eb71b53831d9bacac2477ea1ed25616182ffca37aaaf442ea7eb229fa6c0b31c365835da949640dc17a90de57e4d544f8380eb2d17a53c SHA512 4845a128ceef970d88d92702f0e5700680a5771507dbe7be6b9e97777d86944e3319627a36ede21cc5cc582eec9ba6ad4a5d0824c723f8bd7e057adac4397ac3
-EBUILD lld-12.0.0.9999.ebuild 1774 BLAKE2B 46a267286e87eef2c29faeb4ecfde5434a57d14c9d82c4f92f493fd238941ff9cf40927f21127eea95880f8562bdb411266d493e001a4534026a56fee76f5049 SHA512 5b61895d202eb2e8752b8ea1e713166ef452539bc7895703f82fa2b1f1135dd12aee7094515b5aceb6c3e6d78738af57521d9f33f5de874771f33ac6c2e7c14c
+EBUILD lld-12.0.0.9999.ebuild 1777 BLAKE2B 69690e21b7c4a63f24b873ae13ab37f57f7b7a4c564be295ed185657508e5ca0fcf108a4f114506cdf793dfb3986f65bedfa3886a0d548827de172217718af01 SHA512 3aa55f77f6c966f6bdce54cade8c957b8ad6a5d3152c6cf1d104c145ea35536dc8ec577c81f476577028a7828eb6401323fe6deb5fcddbac2865f165f81294c3
 EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-10.0.0.ebuild b/sys-devel/lld/lld-10.0.0.ebuild
deleted file mode 100644
index 69476bd1e16d..000000000000
--- a/sys-devel/lld/lld-10.0.0.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
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lld
-}
-
-src_install() {
-	cmake-utils_src_install
-	# LLD has no shared libraries, so strip it all for the time being
-	rm -r "${ED}"/usr/{include,lib*} || die
-}
diff --git a/sys-devel/lld/lld-11.0.0.9999.ebuild b/sys-devel/lld/lld-11.0.0.9999.ebuild
index 05be08d3d096..4b86a2bdffef 100644
--- a/sys-devel/lld/lld-11.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-11.0.0.9999.ebuild
@@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -20,11 +17,16 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="~sys-devel/llvm-${PV}"
 DEPEND="${RDEPEND}"
-BDEPEND="test? (
+BDEPEND="
+	test? (
 		>=dev-util/cmake-3.16
 		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
 	)"
 
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
 python_check_deps() {
 	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
 }
diff --git a/sys-devel/lld/lld-12.0.0.9999.ebuild b/sys-devel/lld/lld-12.0.0.9999.ebuild
index 61159e289d5a..3cf868e55cb7 100644
--- a/sys-devel/lld/lld-12.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-12.0.0.9999.ebuild
@@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lld libunwind/include/mach-o )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -20,11 +17,16 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="~sys-devel/llvm-${PV}"
 DEPEND="${RDEPEND}"
-BDEPEND="test? (
+BDEPEND="
+	test? (
 		>=dev-util/cmake-3.16
 		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
 	)"
 
+LLVM_COMPONENTS=( lld libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
 python_check_deps() {
 	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
 }
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 6be596812639..0e3d8bedeff6 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-common-10.0.0.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 EBUILD llvm-common-10.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
-EBUILD llvm-common-11.0.0.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
+EBUILD llvm-common-11.0.0.9999.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
 EBUILD llvm-common-11.0.0.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
-EBUILD llvm-common-12.0.0.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
+EBUILD llvm-common-12.0.0.9999.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
 EBUILD llvm-common-9.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-10.0.0.ebuild b/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
deleted file mode 100644
index d12935e080d2..000000000000
--- a/sys-devel/llvm-common/llvm-common-10.0.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
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild
index df9cf92b47a1..4804d9640098 100644
--- a/sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild
+++ b/sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild
@@ -7,8 +7,6 @@ inherit llvm.org
 
 DESCRIPTION="Common files shared between multiple slots of LLVM"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -17,6 +15,9 @@ IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
 
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
 src_install() {
 	insinto /usr/share/vim/vimfiles
 	doins -r */
diff --git a/sys-devel/llvm-common/llvm-common-12.0.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-12.0.0.9999.ebuild
index df9cf92b47a1..4804d9640098 100644
--- a/sys-devel/llvm-common/llvm-common-12.0.0.9999.ebuild
+++ b/sys-devel/llvm-common/llvm-common-12.0.0.9999.ebuild
@@ -7,8 +7,6 @@ inherit llvm.org
 
 DESCRIPTION="Common files shared between multiple slots of LLVM"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -17,6 +15,9 @@ IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
 
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
 src_install() {
 	insinto /usr/share/vim/vimfiles
 	doins -r */
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 8fac45f0da44..b38e69ff1b49 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -13,8 +13,8 @@ DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-10.0.0.ebuild 10751 BLAKE2B 338970325836138a0214d3e97e1b408b466052abe7bda4815edcb41e3b998a7b9df26bcf2caf457ee8b66d997b383a0f94a196a580671db4b5288b8522e48bb5 SHA512 c588a1cce4e950bdbd189ad0f44c1b9377adc5bdf041a1da4872cc2d629d79f73132f1776cee09d8e08cd799aa7bc0473915d3a3644606e3cc26f5329b533194
 EBUILD llvm-10.0.1.ebuild 11955 BLAKE2B df1609d90f64fe1ff969af18adf18aee99ef3ddc947ee7ebc1c247e0bedc38f39cc46498841bd3fb85378329ef05f5dfa32a522c6549313d27a7f177680ad1c4 SHA512 6385e8501f927a7015298d75e472949470c58b39e35ba8cf6d264662942b714235913c49b9c37f17ce9835c220b64dbea961716bf57b62ebcc8edbb9f46f6acc
-EBUILD llvm-11.0.0.9999.ebuild 12629 BLAKE2B 2af00259c1df990169c614e689007cfea6cb877a9df06b64255c8fde48e9f750b1744918dae483730a40a0152edf99c2bbc72101a2920f19202e2d1f95fe9bc2 SHA512 5e086dda86d65e34ab9528ac2d04945a22aeb359a24c11e9b2a9d4f0862e10c879d2e1bc4e99cf3e650f1685d8c1ddf5a066fb167c880d005fc71670bb89641a
+EBUILD llvm-11.0.0.9999.ebuild 12630 BLAKE2B da2c206c68f009fae39e7e644e2827b6f2f20a4df3c4142e7a327cdbcb0b2dc599870cbf3a3bd7bff9f321ccff08cb26e8f4eb4bd4b9c40aa82891255d7d0fd4 SHA512 e05ead4670869f0e147aabcdc964e693e7f46689f4c76653b0976298c77d90a48f8caac3891d352ce8a4f05286cb8c983818d7e4292b6f9bd121d6d5e988a91a
 EBUILD llvm-11.0.0.ebuild 12904 BLAKE2B f3f6bb06293efb2ab541e17d3051266a551c665f525a41d29733c8977d823dfded4e11fcac963d3302013795539f9774376c5c0f784d5e1ebbf3748cac698e8a SHA512 776abfb031174677a2a6bc36c82af074c2c38c5387af578ca6cd716f8d8a4ad8478a4ffce096dcf0ca18b30cb8231a5df2db35e7b7139efb65e06cb108b1d1fe
-EBUILD llvm-12.0.0.9999.ebuild 12718 BLAKE2B 496526527ec7cc5aea590e45a6d38800da60d446f54568a164465cc184e22e07653e745220d2271ef0d9cacdcad08404a5a5aee153086e6aa99e6022607b5087 SHA512 6091649ca4fc3864f5f3dfefc1fa5d74a539b314775d1da22c8505eafe22c40496b84919b0169de0c85e0fa2a954a98e46f09688c9d8855c3437a6ffd75e00d7
+EBUILD llvm-12.0.0.9999.ebuild 12719 BLAKE2B 7717c08edd55848854fff06141bd7b0a8be44e8c62670690f2306e5761e9373e3899e2ca1dc804feebda8f0e026dc4484e7749bbc7350405b1011ebc9fc626c7 SHA512 fc1b7488ccddf948c3e2b38c4469a9ba39c0568d1f2d0e3e387fe3f317b8d3f6b387b5c5dc8f52acf90900786ebba42cf67f87918c3d2eb5390c2c9b43757b8b
 EBUILD llvm-9.0.1.ebuild 8454 BLAKE2B 33b4c7bdf4bc136d29f3f6f505799b11de31d33e393b51c9bafb121b0b8b347e86a5954ba6ba039cd6b39cb7c1a501d4747f51652351559c42ba0b84c4bae54b SHA512 f43a600265c1559e924a6f2ec97dffdacfae35df2cc3e3e874704c5ae179ba48d90fdd666411cdab500d171fa63b557538282545c7c4078867857e077c941a4c
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-11.0.0.9999.ebuild b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
index 8e4357a1098c..bd682feac731 100644
--- a/sys-devel/llvm/llvm-11.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
@@ -9,9 +9,6 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-LLVM_MANPAGES=build
-llvm.org_set_globals
 
 # Those are in lib/Targets, without explicit CMakeLists.txt mention
 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
@@ -73,6 +70,10 @@ RDEPEND="${RDEPEND}
 PDEPEND="sys-devel/llvm-common
 	gold? ( >=sys-devel/llvmgold-${SLOT} )"
 
+LLVM_COMPONENTS=( llvm )
+LLVM_MANPAGES=build
+llvm.org_set_globals
+
 python_check_deps() {
 	use doc || return 0
 
diff --git a/sys-devel/llvm/llvm-12.0.0.9999.ebuild b/sys-devel/llvm/llvm-12.0.0.9999.ebuild
index a1a53f9e1e26..e5c2eb7959ac 100644
--- a/sys-devel/llvm/llvm-12.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-12.0.0.9999.ebuild
@@ -9,9 +9,6 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-LLVM_MANPAGES=build
-llvm.org_set_globals
 
 # Those are in lib/Targets, without explicit CMakeLists.txt mention
 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
@@ -73,6 +70,10 @@ RDEPEND="${RDEPEND}
 PDEPEND="sys-devel/llvm-common
 	gold? ( >=sys-devel/llvmgold-${SLOT} )"
 
+LLVM_COMPONENTS=( llvm )
+LLVM_MANPAGES=build
+llvm.org_set_globals
+
 python_check_deps() {
 	use doc || return 0
 
diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index f982471840b1..b26732ad8e91 100644
Binary files a/sys-fabric/Manifest.gz and b/sys-fabric/Manifest.gz differ
diff --git a/sys-fabric/infinipath-psm/Manifest b/sys-fabric/infinipath-psm/Manifest
index c4e477f7ec31..b9f06444ebd3 100644
--- a/sys-fabric/infinipath-psm/Manifest
+++ b/sys-fabric/infinipath-psm/Manifest
@@ -1,4 +1,5 @@
 AUX 42-infinipath-psm.rules 85 BLAKE2B fc740e6f5399879060a6f37f4a862fc398e0163e176d8f20e5dbec6c953b6febe49afd848135966eedec7da09ebeabb0e63cb2729618ccb2822e274b39829b24 SHA512 2113118500c9dce4d1faf2a9f5da1e540be82ed6cfbe5ad5edd2927f266d77a698f628ade289716e5f992b4d5a9ad49c6b1f522a2c2a9eda087953f9a082f6fc
+AUX infinipath-psm-3.2-fno-common.patch 2518 BLAKE2B 4cabe6924788235bbac230f0d5486d0ff713839dc48dd6ed673071d1f728497e0cfcd79660cac3468f43c731754947a0b4c293a7709a7cbd72ac35cfb9bca7d0 SHA512 125651c5527f0da432ab0fd3ee4fc6c866d2310ca8a2bf6f00a14056f80671f14ed4deffbec90950b23c2eeeed752c6e45103a5b225b1641ea7843d6a9757d3f
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD infinipath-psm-3.2.ebuild 693 BLAKE2B c7fefbfae76c3cc5ac34536bb6f1239a632d033b5222ad9d0ca90cc20abc856fda5777285632670b614269345636ea99a30875f7c8850c3d2363078260e4d0ed SHA512 dac0b35711cf9a87cd88642d71cff3b2529e032c0a8359ec40d48745ad31be8c419feec9562152fafd164b6fafff0275cba62df070c0b17989747552a9e06c0e
+EBUILD infinipath-psm-3.2.ebuild 733 BLAKE2B eed4b8311b735637a4fd5f573d71f45f9f8b0ba6ca524a10e2e695afbf7b0e6deb060c08a9e06f111ce700ad5249f1286027aedd5c52d35682c9658c28c5f145 SHA512 e71064e2e57a67f048ff753dd0116df2eaa3eb8a58210e0435fe81d8eea80aa22f34d057a16019e3de3ed30185111c43aa87845caa325f7e9bd0c5a4dbe65bfc
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch b/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch
new file mode 100644
index 000000000000..7f376f009e75
--- /dev/null
+++ b/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch
@@ -0,0 +1,79 @@
+Taken From: https://build.opensuse.org/package/view_file/science:HPC:Head/infinipath-psm/Add-missing-extern-keywords.patch?expand=1
+Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+
+--- psm_error.h
++++ psm_error.h
+@@ -42,7 +42,7 @@
+ #define PSMI_EP_NORETURN	    ((psm_ep_t) -2)
+ #define PSMI_EP_LOGEVENT	    ((psm_ep_t) -3)
+ 
+-psm_ep_errhandler_t psmi_errhandler_global;
++extern psm_ep_errhandler_t psmi_errhandler_global;
+ 
+ psm_error_t psmi_handle_error(psm_ep_t ep, psm_error_t error, 
+ 			      const char *buf, ...)
+--- psm_user.h
++++ psm_user.h
+@@ -100,7 +100,7 @@ psm_error_t psmi_mq_wait_internal(psm_mq_req_t *ireq);
+ #endif
+ 
+ #ifdef PSMI_PLOCK_IS_SPINLOCK
+-  psmi_spinlock_t  psmi_progress_lock;
++  extern psmi_spinlock_t  psmi_progress_lock;
+   #define PSMI_PLOCK_INIT()   psmi_spin_init(&psmi_progress_lock)
+   #define PSMI_PLOCK_TRY()    psmi_spin_trylock(&psmi_progress_lock)
+   #define PSMI_PLOCK()	      psmi_spin_lock(&psmi_progress_lock)
+@@ -109,8 +109,8 @@ psm_error_t psmi_mq_wait_internal(psm_mq_req_t *ireq);
+   #define PSMI_PUNLOCK_ASSERT()
+   #define PSMI_PLOCK_DISABLED  0
+ #elif defined(PSMI_PLOCK_IS_MUTEXLOCK_DEBUG) 
+-  pthread_mutex_t  psmi_progress_lock;
+-  pthread_t	   psmi_progress_lock_owner;
++  extern pthread_mutex_t  psmi_progress_lock;
++  extern pthread_t	   psmi_progress_lock_owner;
+   #define PSMI_PLOCK_NO_OWNER	((pthread_t)(-1))
+ 
+   PSMI_ALWAYS_INLINE(
+--- psm_utils.h
++++ psm_utils.h
+@@ -254,7 +254,7 @@ int	psmi_diags(void);
+  * Fault injection
+  */
+ struct psmi_faultinj_spec;
+-int    psmi_faultinj_enabled; /* use macro to test */
++extern int    psmi_faultinj_enabled; /* use macro to test */
+ #if 1 /* possible to disable at compile time */
+ #define PSMI_FAULTINJ_ENABLED()	(!!psmi_faultinj_enabled)
+ #else
+--- ptl_am/ptl_fwd.h
++++ ptl_am/ptl_fwd.h
+@@ -47,7 +47,7 @@
+ #endif
+ 
+ /* Symbol in am ptl */
+-struct ptl_ctl_init psmi_ptl_amsh;
++extern struct ptl_ctl_init psmi_ptl_amsh;
+ 
+ /* Special non-ptl function exposed to pre-attach to shm segment */
+ psm_error_t psmi_shm_attach(psm_ep_t ep, int *shmidx_o);
+--- ptl_ips/ptl_fwd.h
++++ ptl_ips/ptl_fwd.h
+@@ -38,5 +38,5 @@
+ typedef struct ptl_epaddr ips_epaddr_t;
+ 
+ /* Symbol in ips ptl */
+-struct ptl_ctl_init psmi_ptl_ips;
++extern struct ptl_ctl_init psmi_ptl_ips;
+ #endif /* _PTL_FWD_IPS_H */
+--- ptl_self/ptl_fwd.h
++++ ptl_self/ptl_fwd.h
+@@ -35,7 +35,7 @@
+ #define _PTL_FWD_SELF_H
+ 
+ /* Symbol in am ptl */
+-struct ptl_ctl_init psmi_ptl_self;
++extern struct ptl_ctl_init psmi_ptl_self;
+ 
+ #endif
+ 
+
diff --git a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
index 0654f6526906..3df69cc34f9d 100644
--- a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
+++ b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,11 +10,10 @@ OFED_SUFFIX="2_ga8c3e3e_open"
 OFED_SNAPSHOT="1"
 OFED_SRC_SNAPSHOT="1"
 
-inherit openib udev
+inherit epatch openib udev
 
 DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
 KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE=""
 
 RDEPEND="sys-fabric/libibverbs:${SLOT}"
 DEPEND="${RDEPEND}
@@ -26,6 +25,7 @@ src_prepare() {
 	sed -e 's:uname -p:uname -m:g' \
 		-e 's:-Werror::g' \
 		-i buildflags.mak || die
+	epatch "${FILESDIR}"/${P}-fno-common.patch
 }
 
 src_install() {
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 3a631260ba2c..dafc6c8b619e 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index bf0946a2997f..00f00972f7db 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -1,5 +1,7 @@
 DIST fuse-overlayfs-1.1.2.tar.gz 98055 BLAKE2B 04cee8052671431604031ddd3d0ebc254de0ba00a527b4a7caa24bf4a0b74be81c9d0f2c02e5eb583c3f6a61b540762b52617531f266341878cb54f40e087331 SHA512 41bb7ed21d0408af61820b9aebefb08ee6add0c9a15ff1cafd8abc7ff6fcc46afd53740c946c6835bbba8c58ee8bfcc8351cd2a1fe81d749dad81934ce44032b
 DIST fuse-overlayfs-1.2.0.tar.gz 101375 BLAKE2B ff71ae8ad58396a8365fd65574145b45ae9632f407e2246096822cca12eb17d7a7ef9f5cc3546c83573b7af56b96d8800d6f390477cff2fe88c2858ed198740c SHA512 55aa7c92f964ab18b886607de705b98510c7f25cc0d90e4712fb8493a4baab9ea722d8966a9b7e8f8fd8e5d2163a54993e9e45dfa2699db6cec8b447bdc5399b
+DIST fuse-overlayfs-1.3.0.tar.gz 102059 BLAKE2B 30564f9a06ed04f7716170ee864bffeb899f8fc6b411cc95dbe920632dcb2ea2d9d7a9472b35fa33ddca86570978913f8651c35e3544bd650a95c52ca0d4d3ff SHA512 c374b5dd4d369ab0134f66ff021c8efbc35f173a2d53a7212d5ec459c5083cd0fb5fc93b68696db5903891aa33c719be7eb3beedcaab043459f8b506d7cf5c0d
 EBUILD fuse-overlayfs-1.1.2.ebuild 564 BLAKE2B 1932eec0743d4360b15f3f487e337271b4b6befcb9365869dee089e31145926dc4be46c67c81caf3ed18ffafd26cd799f3126d62e8427abb8f6573fb083aeefa SHA512 d94880968425bf4c54aa40fae97744d72b8ac41427f7216f399e796ab771fb850bf72c7b890a80e69b3ab9e5c5b2d55d2086bfbf8e7442be877fbac4054a117d
 EBUILD fuse-overlayfs-1.2.0.ebuild 564 BLAKE2B 1932eec0743d4360b15f3f487e337271b4b6befcb9365869dee089e31145926dc4be46c67c81caf3ed18ffafd26cd799f3126d62e8427abb8f6573fb083aeefa SHA512 d94880968425bf4c54aa40fae97744d72b8ac41427f7216f399e796ab771fb850bf72c7b890a80e69b3ab9e5c5b2d55d2086bfbf8e7442be877fbac4054a117d
+EBUILD fuse-overlayfs-1.3.0.ebuild 565 BLAKE2B 6cad51a1921aa1c48f25baa727c28c51c5876c83944be93529c8639bfa75f90adfed39c7247768b0beef5cbd612e4087485078c9a4508a1ddd8d982fb9797c9b SHA512 60da39f950d584bac0c032f2ecdd8a479875916816459083c7fb21888fd912d6cf4b78c4419a8f30f909473a52818aa60cd75d140cc771352677c30b88ddb65d
 MISC metadata.xml 334 BLAKE2B d159a1336d5c016f97f854c7dc8267a7df63d9352fc81670d09fb436aa1267c842a466bbe026443a57c3e910c927f361d0ad25e9785ea785e522500c966beca0 SHA512 c91863d890e5145d3e05d247455ee2d0bda70525dfbc15632e11df75ccdd40bdb0dca17b41d3f8485ad1768cf401915ada074ee05f739d74df93d440785b6fd5
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.3.0.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.3.0.ebuild
new file mode 100644
index 000000000000..ca9d3f24ac43
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="FUSE implementation for overlayfs"
+HOMEPAGE="https://github.com/containers/fuse-overlayfs"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=sys-fs/fuse-3:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index db655eac52c7..37d782a1522a 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,5 +1,7 @@
 DIST mtools-4.0.24.tar.bz2 418178 BLAKE2B 96ccbde0e5ed5e304c73c7faaeb495751c43ae37970e5c2329299e0f7bf90f3a810f4ca95faea10a00e5af110be579a3b083043314e980bb0128226caffb5608 SHA512 b74becc4f696315cfabc016d1746e744b43e366de73bf1bffeec4fbab1e4815967594de8acb4af01f89d36a925f93672efbac205b89540161bd53ab7edebcf04
 DIST mtools-4.0.25.tar.bz2 421807 BLAKE2B 54b0de421d5de003c6dff9a524af2a37d7fe0fb88361e195b000b8c8637ed894ec01ca295ea71ed0df781e9503d609f5e21b987a79c7e9d2c2e0c7176d5eb825 SHA512 91b879de6b41bf9fd6d9282d846e21fe58dbcd3461d97d2d6cae752a309a5129091a0e6ffda5b28ef062c33970a1c0a43ff1cf19106232866bdbdb762c64a143
+DIST mtools-4.0.26.tar.bz2 420648 BLAKE2B 02f75722e8569c75d09fbee8667b24d8fd5c685940b235de33e268b8a349a49798f50db22470200e9fa30244768c07a568bfe124969f2a34f652c157ddb37e89 SHA512 32303ea16314ca00f33aee103451958f13c71ab1f3975e9a1dd9236c8e775286985ee776c38c64a1f8f5f8d0a66cbf84643182913e4e2c2dcaff384a9acd8633
 EBUILD mtools-4.0.24.ebuild 1045 BLAKE2B 2861833d297fdaf906239a2a52a5c922e0a195116ae73548c6d47212faa682b7b12f7bd20b68a167d86ecebfd2f6561236ff53bffcf093686bbf7c2c1893d6fa SHA512 dcb73024498715f8173c65076fa02a78873d01f22849fa568a6757384fc93e47981f1c95125a56646612f7dc4af39b4995ba0ef1ef41467f51eb60a99ee2b030
 EBUILD mtools-4.0.25.ebuild 1051 BLAKE2B 8bace5704234712bffd3c88ffce51534a6a141caa283501cf6599a96d0e6b99ae7bc40543ea064bb8385900e4bb6623c0005b8bde0b9a3beec510bd9cbbd8f01 SHA512 4ed910c39dd8683b28a2238e46bf015329a36f516761c486f9dfc987c919e8e3780270de173885b97eb9455232639d5dc1d83da5a24bfcffdeedb2bc637700c4
+EBUILD mtools-4.0.26.ebuild 1051 BLAKE2B 8bace5704234712bffd3c88ffce51534a6a141caa283501cf6599a96d0e6b99ae7bc40543ea064bb8385900e4bb6623c0005b8bde0b9a3beec510bd9cbbd8f01 SHA512 4ed910c39dd8683b28a2238e46bf015329a36f516761c486f9dfc987c919e8e3780270de173885b97eb9455232639d5dc1d83da5a24bfcffdeedb2bc637700c4
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.26.ebuild b/sys-fs/mtools/mtools-4.0.26.ebuild
new file mode 100644
index 000000000000..a10154dee9ba
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.26.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
+HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="X elibc_glibc"
+
+RDEPEND="
+	!elibc_glibc? ( virtual/libiconv )
+	X? (
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# 447688
+	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/mtools
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local -a DOCS=( README* Release.notes )
+	default
+
+	insinto /etc/mtools
+	doins mtools.conf
+
+	# default is fine
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 76d09800d74c..e739dee580a9 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 274e34bc0d7e..555c46dcef76 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -127,33 +127,33 @@ EBUILD gentoo-sources-4.14.205.ebuild 736 BLAKE2B 22c5fc716a47e3c45726cd95b34558
 EBUILD gentoo-sources-4.14.206.ebuild 736 BLAKE2B bb02d63f970eef34eb8d0913c7156d288abdd386697466bde2719a5254d8037195439cc9fbc6039b992093184743425d2fae80eff64148dd712a9fd8e545a034 SHA512 6d9b10dc70be4eda02386aa3535200f983f900e634400386e68cb36db01f57b7216006ef39043761cb947c6fb4c7914650adf02504d297c03d83bfc2f4f26e6e
 EBUILD gentoo-sources-4.14.207.ebuild 736 BLAKE2B 666b08ca1007df5e676eb051317528956095969f6e34b21f7cf061ed66428e3f92a4afa3eadd42c97c155bd2943653008a1c2d6cb5ab3d96566ca6e7496091a4 SHA512 e2e6e94cb7994da5fb68811ee3c870e9ac12d5f34f85c81a584c5e9ffccbec94534bedfe6b2c911849933201e72d522d68481fe820ab652449dc87d1605c4e83
 EBUILD gentoo-sources-4.14.208.ebuild 736 BLAKE2B 28a198049ab28c506ec7cb803e5baa35df6eef799cae25347c2b7807d99ab471c174920124351bd140dbbcd220db87bdcd8d09bc00c7d35e4facfe22776529bb SHA512 8c1f30fb6eafbeff7dc68960beabbabd16b2c985823a8b467ccb01712783e703368aa0dffec46a881899497a35b9230670384ee632f45627faa776fe77eb0856
-EBUILD gentoo-sources-4.14.209.ebuild 732 BLAKE2B b3bd51bdf7e8d84981c68ab17c665be8c5245dc82a31141d1b13e085826056b133cced876eb0a46fdaf8665772625f8529e7dfa35192ea84ff6a9218123e6eac SHA512 b53e4d564a94c4241371be5a952c84446d4539addf93bd034049e621e5c9dacb005a1da3c24ff5653ee3ca50c19b4b48a579485c90d3190464ef9ddb4bada1a4
+EBUILD gentoo-sources-4.14.209.ebuild 731 BLAKE2B b3a70f5936486c2a1bc8e8bf49ed225800d243bd8830860191a4598c6d072521a8e058cd74830814d3a22cffc12f977a3a42380a0536c13cd8d3b3f9d630b8fe SHA512 c9bb1cf580a4f48f42dc3771952ba2f96c0e59a9f67f13adbcfc2ced24c7a9ffb875e6075c427342febb4313a61d85829ecbe85101334c4aa6af59117e32b70e
 EBUILD gentoo-sources-4.19.152.ebuild 729 BLAKE2B af92f3c7e501a8163751ef29edf64a7ef10b3dc71e5088e3d7637e5761673b1a999ced2283c5fbbf246249e5de3018a0367c91552bb84f77d232531122153276 SHA512 7051bd5e350e2a5fd97720a895831b3b0fa5818dd0edfff2e7aed7221e6e562ca89aa8cb5dabfd4973c539384914e33651cdb220da9f20f4b5b231d427597419
 EBUILD gentoo-sources-4.19.156.ebuild 736 BLAKE2B b0d24c5546d811882ac3cf1ab943b27ec118a6737bf6134e8d97daa44177ec50297536e0a356aad260997cd6ea49aa753e3ea8bf3828c43721821a20a507efc6 SHA512 a3676de02527c93a33d67b9ccafee4d1afab38515a4595034b76f2c37f104c85f3826b37ba22df47057591d38b21db630a3b2f39f6321b3bae1c82596e2af4e0
 EBUILD gentoo-sources-4.19.157.ebuild 736 BLAKE2B c315f01e45cf90f84605c38625a51f693a9366ab047eed7618e53a0f6aff3b0670aba90c6f7680099b5c0126e4bc60b0fea747b3fabeceac975758b46f3a0ab6 SHA512 a58670eab246d30372fed7e6d757f614cc700669bc27e78b7b4656f06ee3539201698c263a846ae3772c217ad3a6aa1cd5e01e79782b2530f8d886fad28dea9f
 EBUILD gentoo-sources-4.19.158.ebuild 736 BLAKE2B a9fa4f8ce86772b5711b032495650d3d6680543d62122b9d3a98a179c16f97857d197698830ee91f1ebdefb357ea7297cfdc22237b72cc7c2584ae129270220c SHA512 56e8fc2abc441aa6b4fde17f6159c3101b1190aff15be3dc49acb8e3ece1d7d0cd5d5660ee9c35f14c62554edc22901277f7ea5019258abb370aba754d6b8ae3
 EBUILD gentoo-sources-4.19.159.ebuild 736 BLAKE2B 310edc0164ab12aa6990d375bbc7ed4fa1f804d07ef1a5ee4896cfeec84619b97a2cd8747385f0f1b6b4bea1ca8cc9957d5a9f5ffae06a364c861e6bffdca881 SHA512 78b124d620a47db6dbf2b794517b267e5284367646126a0baae895875bb7aebc3ff0364b1e135a10c12a557f3bfe95d568d1905768e0e0583783a32d83de4406
-EBUILD gentoo-sources-4.19.160.ebuild 732 BLAKE2B 19f5a7bb47555ad209b0c7e450679df3d8a890e9b372a867f4c3714cbb135a13d09ce21a9ac0b0611e7658098f11f8c8aece7d1d933b8aaece40d58ccc30de79 SHA512 689b38406322b4ebe867b4d225abc96cc3c56852553d0305927882ec900c6906b3f2dd60b875d4b3db83dd51db3a543370cb2eaf9db06e409f05fa1b1dcd9491
+EBUILD gentoo-sources-4.19.160.ebuild 731 BLAKE2B 895af16c9ba7d65fbdfbadaa4966e6c577d70b3196bd9912c2b9bc5704f1fa73ad90bcff33154d9cdb64c6154f4d59e431e9e3d5f89ac611401bd6f533c442e0 SHA512 855743fa1175fef8b9535da2bf15d938ab2c44be6401daa73a8f032e39ee824501528a7bd3a38657a99fa818ceb83594c5260af559d5de1389498fa73b7342cf
 EBUILD gentoo-sources-4.4.240.ebuild 729 BLAKE2B d8c6039decfcf4b564ebcafd95aab1324bbc5532431b5356b9ac01f4117545c94c7b6f1675101f90414dba03632e5afa1ad89f85fa9a8f42f87ffdf12eefd083 SHA512 bd58aaa8202e984d54d4f73537616684a9745d5f2f9f4682c01ebac010b428a89e2ec887046692d4729e6d6166fc8239401f3fe78ca92afc27c3368d477cde01
 EBUILD gentoo-sources-4.4.241.ebuild 736 BLAKE2B c9b5553d58852333a0b1e66087cc50f317c3a807e02cface7c4a387b46288227063f1e47f92eb12332e83dd4d6fb7bd37efe203d31518e90bd3a73105ac461ae SHA512 a2f941f1db6a599456167286080bc48cf1696ee00c6c79281a34ca8717392fd7293a0a9a60128dcc9e0071e40c8baa84b2587c7a5bd015619f2765b494c3a115
 EBUILD gentoo-sources-4.4.242.ebuild 736 BLAKE2B 7f6db552af8c84891b2668ad6cb803a2f8a41225996b408376ed3e3c6f97b9b7e23957fd8c541146bd002a3c8f1b08f413bd41bcb61fd5a23e95060e64443557 SHA512 69df9fb2064513b39f0b55ed4954e3b7202265ca2c75440365ea6ed1d6a3b0f0fc3c72c398ebd9f1e04169c56b7c341e27b8cdbf55c02cf128f630f3f82a92ae
 EBUILD gentoo-sources-4.4.243.ebuild 736 BLAKE2B 606855eab2ec55c7f3ec26b95392c4551494d04307fabfd8ecae5ddca614d552cba57efa99efc4abb8ba2903d9bf35f227af6d577cb799bd969882c5eac8fd42 SHA512 7c830f58ed46b01298d1a94c5e64bf93b563815a52e073b674baa9b21ebfb04e5abb03e83d82fe1997f7aa6d4b5edd742c45c07c37e434fe1e3cbf584ff24a6e
 EBUILD gentoo-sources-4.4.244.ebuild 736 BLAKE2B 073b5fa6c20d5d6312c905e8d1b656ddcb6a3cf6a715bfd0aa19cbddee9ff8695dac0260056cabab3aa21e2048f013fe8d623c9d6a9b4073b776e377f70354bd SHA512 60b4930008b2c1bf168c98de45d82d61e8d06e2eb59839b5aaf4519363b3929efe9c791d762154525eec9a5f17f703e6a0d2b4dc90105098502e5d975c93d983
 EBUILD gentoo-sources-4.4.245.ebuild 736 BLAKE2B 7cd984927f75a3771a40487f5f9aeebe21d217fe6d9abb69fb6e200b5f97478fa59e65b439b454596fcd9ba3356c6ba35de83fa65b83845c1b05869b7884a2c9 SHA512 7f3878fdb5753ffd26c1dc2aa9db136230e5afc2f2069e42295e591d613ddc1989069c851b6d0b376fa5e16810595e9f72c19ba30bbe97002b0a2cb94b24bdae
-EBUILD gentoo-sources-4.4.246.ebuild 732 BLAKE2B b19eb1c8bb438c62842a3cbc1c99b5f52bf55da92d2ede8a0f1790b938f1cf160aec940f45080d435461c5eab597414521fc11236e936b0941d28c1087242326 SHA512 20bb7918411003da9eaaa241703c92768f250affdcd8c493a3ac13d7ae63eb499f44b66ee4613333954c5d416098c6af1e11f9a45163baf415a778b8bd3b462d
+EBUILD gentoo-sources-4.4.246.ebuild 731 BLAKE2B 48e474ee0b124198d6c6250a2ad0b8f7449a04b9abc04732fc877d0c0da3b944f90ba4e9fb2c94015da76ba0da3b1a20d787373c8d57329cc8689b6973fdb310 SHA512 83639333d54b7a245200132534215d74cfd0485a00d912b9f1d3f315a249752b721760a8d0c3767444ff40f6c35781ab82783cea5b77724cf0590d1e70d312eb
 EBUILD gentoo-sources-4.9.240.ebuild 729 BLAKE2B 1ffa95b048658a51278083948fafc653c03fa6483cc57742a9a279be3c72269315ff38cb85350e4d52a1928f99aa08fd6f446a9c009e049c8a7949eddc7d87b0 SHA512 50a2b935993aa2a2cca5d3ad17d7a06cc7c853647c3da2b6449aeaeb7817788d3d809bec2479077a7bbe049d18cf2f185464d0932f300468db03c4ff7357b747
 EBUILD gentoo-sources-4.9.241.ebuild 736 BLAKE2B 606855eab2ec55c7f3ec26b95392c4551494d04307fabfd8ecae5ddca614d552cba57efa99efc4abb8ba2903d9bf35f227af6d577cb799bd969882c5eac8fd42 SHA512 7c830f58ed46b01298d1a94c5e64bf93b563815a52e073b674baa9b21ebfb04e5abb03e83d82fe1997f7aa6d4b5edd742c45c07c37e434fe1e3cbf584ff24a6e
 EBUILD gentoo-sources-4.9.242.ebuild 736 BLAKE2B 073b5fa6c20d5d6312c905e8d1b656ddcb6a3cf6a715bfd0aa19cbddee9ff8695dac0260056cabab3aa21e2048f013fe8d623c9d6a9b4073b776e377f70354bd SHA512 60b4930008b2c1bf168c98de45d82d61e8d06e2eb59839b5aaf4519363b3929efe9c791d762154525eec9a5f17f703e6a0d2b4dc90105098502e5d975c93d983
 EBUILD gentoo-sources-4.9.243.ebuild 736 BLAKE2B 7cd984927f75a3771a40487f5f9aeebe21d217fe6d9abb69fb6e200b5f97478fa59e65b439b454596fcd9ba3356c6ba35de83fa65b83845c1b05869b7884a2c9 SHA512 7f3878fdb5753ffd26c1dc2aa9db136230e5afc2f2069e42295e591d613ddc1989069c851b6d0b376fa5e16810595e9f72c19ba30bbe97002b0a2cb94b24bdae
 EBUILD gentoo-sources-4.9.244.ebuild 736 BLAKE2B e6b562746eddba6d0b45dd4741613744f3368f3d953d8a34c67f788c2891b3087e94f3ba2d7181986be5e9a88ad9bd2f0637cd0e8623b76a67abfd322468811f SHA512 33fa5a535efe5eb4da60fb3c3018f8b3325c3cccff5a748c633e4b8459968e6c9791e6c918efb9326eb6980728f6458fc0dcb8d5b7b37d95949d1820661a0f6b
 EBUILD gentoo-sources-4.9.245.ebuild 736 BLAKE2B 5d497c876fd97ebc065fa88f212025a133e5ca17fa21c6f64c0396009f3f288b8cfe36a0124e51e63c986ea5c5096392c4f0edfa95423eab39a9cbbff2156ac5 SHA512 65392ae49304ee685ef22bd7a81752436b9684ceb153029aacdd7270a86224c9d0166c4e9d4149f288069f6bddd7f37b5c05e77d930a5a4a23b86bb060014f66
-EBUILD gentoo-sources-4.9.246.ebuild 732 BLAKE2B 9388961ae92782abb2d312b83be2d99538ca91f6e17194ea0d1794982a7ad976f2bedc137503f9f745800ec54be0609271f4f4ad579179cfa38d79c1c9e1bd08 SHA512 31d967cfaeaa0e2fd4667e8e8250a517ebab820a024a338c0188dfbef0a8385db4afcdf961bd46c442e0c833317ebe8162a51ffab1f0c43a83a6327ad05ca52e
+EBUILD gentoo-sources-4.9.246.ebuild 731 BLAKE2B 1b290e2f27d5b166e1ee796cb50f2997def85ebccbf67f36665c2f7f82bc4339acd4915b4c9708bce2d1c1ab4d2a90d1ac134f45328745142d2e28ab9eaf8c13 SHA512 40a422d703a6fad87ef05174a77f50e795b55a2ce56ff4bd48b180f1bebe84c3749389aab4095ec452acb89518e5940e956174e866093724125ac0eb68859ef9
 EBUILD gentoo-sources-5.4.72.ebuild 727 BLAKE2B 9a89ee62a4b72cff60cab136237751830f0642d7a65eea3bc9d952da178bc7fa3d9c482b9b1fd53d22b2ee92abe6b38e48e5bedf02ec5f39ec3ea402a7114e36 SHA512 3742724f8d9e9f36111457324c77196acf965067b5e203743a4bf67a317228c51552b0a8a32be7f18d18c85ec051050d7c9ee0e18b7dfee2784c77e9c8ad11d7
 EBUILD gentoo-sources-5.4.76.ebuild 735 BLAKE2B ae397faf76750809950ef683a8ab6db1d1985f5dfcc4657b469e2a2c0cf94ea487a16325bb6ef0e92bdcce333dfa1bb53d0fa1d1213dbc331a7c5803ff2c11a4 SHA512 c8547727f20d9eb59a84749c3b8460755d34d5ec9f80ae57963f0c7e1750893b21d94f7b4d29399838fa9982b0d523ed52ce4e0f02df1fb6c148dc27bbe98fa3
 EBUILD gentoo-sources-5.4.77.ebuild 735 BLAKE2B a6ee2f711c4d1af8d8516e46aa91b26ac591864356e50963bcb4ff849aa52a685e282a62fd8c0b6c6119f76f056aa703e24073b6f4ba98dd96013d257c0f02ae SHA512 7df086f90c042cec0c7fe3bc925ae20e331b59f9559329a56ebbb58047f24a6d0b52d25ddb350ff8b70785ad8f91d396338714d073266f8a03cccecb8ccfa37e
 EBUILD gentoo-sources-5.4.78.ebuild 735 BLAKE2B 626bd045a118701e7f5dfffb6bdcb9b89097c687428bde7b956edae68044e6766f43fb7ff0e39524d42cdbd5928a40c213bc4f6b5bd087fc891308c371ee3ff3 SHA512 51fea2a3892f66c1dcef9ea3bf85661339f7e72ec4c7a636815a97a878900a90c4e9ce4916cdf9305f1fcc8b7ad6170efe252440a22641279de9aedaa31c68f1
 EBUILD gentoo-sources-5.4.79.ebuild 735 BLAKE2B 08dceb72c3a89c9298595e475e46664e260131aabede8492e6debba770b0df3832717ccb88de4fd466fc9eb509e24f9d3e75cfdb3591a5850d9d5700ff6e81b5 SHA512 e88735d5abb3b36046a6ee521168be099f74ce252fd23e0d84ba561b2ee136293325697df2d64b18c64ac25b4fc6c39d0ceaefdbe43901cf0fd27bb9bb37b58d
-EBUILD gentoo-sources-5.4.80-r1.ebuild 731 BLAKE2B a5d25c7b13e651d7225a30730b7fbd226c580d1aa797fdd17f7d16ef9c526e447379b81d8ee4060b3d06197f8411d81691a169f95f30b2250be0c6654f354305 SHA512 2662678157b26ff863212c6a88d9c8099028abf09fa87d957c30b24926efc0261509f54eba41057f35af2c7fe2d8039a11f87d37e4c98903b0f5c07c6d2ae8dd
+EBUILD gentoo-sources-5.4.80-r1.ebuild 730 BLAKE2B e256abdd2b1ea8a1cd92c5fa419d03f42d42928c283983d1cb96518828d6b8d7c99625cb6f99ba84405c608cdc2feac269b19a47a2e76065ffb8accc8fe0231e SHA512 e4cbd4f8e2dbd41b2b3777deb542b1e8d41bf464cb1d348500ebc57ccada3aeee73f362e2addf62bb615c38c4d5f7fab379621d683a85cc03396240eb8cea56d
 EBUILD gentoo-sources-5.8.18.ebuild 735 BLAKE2B db28f4bc1823b6439d9fd95da850b18afb4defba0d321e75d4d425f61a1a22cfa8d33cc29d8afd40732a16ba2827d2f235451e5ed70c2d6e5a363884390b2f6e SHA512 86ff4d97323814690dd974d5d5f2c0abafe85b49bd340995c275f4d58d1a3d38fd1e0742165889c8a3f166a0440626c8e1fc8df90190ad60445bb5029097dacc
 EBUILD gentoo-sources-5.9.10.ebuild 750 BLAKE2B 341c7df92d7e5854dca74a5f9bb0d281b80eb6624e5fab2013921f1fdd9e68497c3d2ee11007781162d6dd1e4638145788ef875f0ada46573ed590c04b2f116c SHA512 8ecbacbfc2f721d6af45d9161e3ba859dee2da2d2638061f73b093d80e541544a41e5a2d61f126bfd45597346759a695ac40c46c31d1adb0d4171d5d97122e3d
 EBUILD gentoo-sources-5.9.11.ebuild 750 BLAKE2B de81293d134e9d0c67bda1deb8986eb26d6b0abe32e33109a819a954cb0d2981014b908e8d0f77977d766705ec53e8b6a311ca392276b074da637dd3b646c21a SHA512 d69969546944c262ee98dc7607705b444fc82ac14be1a595156fc1cb9d962599f94abba80664f14fab53c618788b10a8815f20bdd4f304f4ebffec3d1583179f
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.209.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.209.ebuild
index cd7fb9a76d30..1c3b414584d7 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.209.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.209.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.160.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.160.ebuild
index 1700bc220cc9..62dfd5e7a307 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.160.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.160.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.246.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.246.ebuild
index a1371d3916e3..ea511523936b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.246.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.246.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.246.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.246.ebuild
index 726da9c266dd..b73c4a463493 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.246.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.246.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.80-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.80-r1.ebuild
index 99c3de52a25d..a50c69f5ac93 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.80-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.80-r1.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 68c9813c1506..9115921576be 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 9c0a0c7f4b19..f4b1fa90b757 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD compiler-rt-sanitizers-10.0.0.ebuild 4552 BLAKE2B 5b4130f8f81fa91932b4c814bbbd3b8c3636f881c097463faf2914ecf3d9eab8d741130fe99ace77faf7c4180606f9e0785acdc037c2ca2226f220b925e0fc23 SHA512 b17034bf3dd2596a07c78f523c2ed64329f18086f7d5ee2861793a3484b1c5c6a7c890820ba2e1cb4e64497d88ca39308be84a7751812789fccb16542c1097a5
 EBUILD compiler-rt-sanitizers-10.0.1.ebuild 4501 BLAKE2B 3a15cc67e7fdbf61e2103ca9e543f936cc6f3221f0f3b7d43788cef7785f5742674ab0325e8c0c5cefe8909cc860a9ff0d42b615c367c1ea736cc745817cd9d0 SHA512 97b6b2b68a6de75e211b5f181d76fcf573f72fef7ff8f49248d03d201c2fec6f7d525c048b5b8b5cdc79c8512948f0ec75d5dbaa286172df929d264956d2c675
-EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4489 BLAKE2B e7b75b61ab066ad0821159614f030f58f6795f8da7798781a302f35cefeb510cf20a3101bc1b23b9e16d027b12b7115304ba9d4f4cd2ead794bb28b779cfabff SHA512 098191f6ff96ee57229b2c502665cecb08f231a7209a39732de5289c277ed7e10508c544ccdc5a5c824a7196cd77e32a80969bc1d719d1e63cda9c712693c549
+EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4491 BLAKE2B fa7e441b014225d4f08b369e839068083f97abfc23cb9923876bbcd22d4fc988a6c87eb7ec128ada251dd6897813a51ad475588a343c954d61fdd11267f04cfe SHA512 7cc1082997453322f4f8e3423d9b44b2b0d1dca1ea1a5b1f40392484605c58a49b6b825248f46f5c0e81ae58e7416475eea51d260d456c8b0a58a8314f2f302b
 EBUILD compiler-rt-sanitizers-11.0.0.ebuild 4560 BLAKE2B cbf7fbe130a07347ed1c86f40c770212b6b12755d0a94b2de3b28f9f7ea587cc382d59e412cff1940aa0ac303d0ebea69211aabd9be93979d07cd2ce413a7716 SHA512 4cdce8813e33c2b118f6ec3d37ab3e3fd5eebae5bd8bf94e95d320413b33f567a8337ee53ea9791c2cb6f36a808b49211687ee0984cccd25ac0b0e5d9d74c8ab
-EBUILD compiler-rt-sanitizers-12.0.0.9999.ebuild 4489 BLAKE2B e7b75b61ab066ad0821159614f030f58f6795f8da7798781a302f35cefeb510cf20a3101bc1b23b9e16d027b12b7115304ba9d4f4cd2ead794bb28b779cfabff SHA512 098191f6ff96ee57229b2c502665cecb08f231a7209a39732de5289c277ed7e10508c544ccdc5a5c824a7196cd77e32a80969bc1d719d1e63cda9c712693c549
+EBUILD compiler-rt-sanitizers-12.0.0.9999.ebuild 4491 BLAKE2B fa7e441b014225d4f08b369e839068083f97abfc23cb9923876bbcd22d4fc988a6c87eb7ec128ada251dd6897813a51ad475588a343c954d61fdd11267f04cfe SHA512 7cc1082997453322f4f8e3423d9b44b2b0d1dca1ea1a5b1f40392484605c58a49b6b825248f46f5c0e81ae58e7416475eea51d260d456c8b0a58a8314f2f302b
 EBUILD compiler-rt-sanitizers-9.0.1.ebuild 4847 BLAKE2B cc23d456a4c52596858a405bc74c3c5db35c4fe116685cba4982e2753ba01941bd2c166f56e4278c79e02b06229e90a7fba9fce923360dba8bbf516c8a665ae6 SHA512 dc11719f142cfa56c86373e7e6dba88957511218a654c138ab37d3de01a60bd77f8dd4bc90ed634156d0952b350dce1bad08f8a2db1a7d207335596cdd0bd4d6
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
deleted file mode 100644
index 802b49fc4517..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
-	multiprocessing python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( compiler-rt )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
-# FIXME: libfuzzer does not enable all its necessary dependencies
-REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6"
-BDEPEND="
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		!<sys-apps/sandbox-2.13
-		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
-		sys-libs/compiler-rt:${SLOT} )
-	${PYTHON_DEPS}"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# disable use of SDK for the system itself
-			-DDARWIN_macosx_CACHED_SYSROOT=/
-		)
-	fi
-
-	cmake-utils_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake-utils_src_make check-all
-}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
index ce473ae200d6..1e3a849c675a 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
@@ -8,9 +8,6 @@ inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( compiler-rt )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
@@ -32,9 +29,14 @@ BDEPEND="
 		!<sys-apps/sandbox-2.13
 		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
-		sys-libs/compiler-rt:${SLOT} )
+		sys-libs/compiler-rt:${SLOT}
+	)
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
index ce473ae200d6..1e3a849c675a 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
@@ -8,9 +8,6 @@ inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( compiler-rt )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
@@ -32,9 +29,14 @@ BDEPEND="
 		!<sys-apps/sandbox-2.13
 		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
-		sys-libs/compiler-rt:${SLOT} )
+		sys-libs/compiler-rt:${SLOT}
+	)
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 0b13b3a91e1a..f7c1dc4d140b 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD compiler-rt-10.0.0.ebuild 2918 BLAKE2B b815aee19b40b970d1331e5e5c71ffe7b9279b900b3392fbfd627b661214f0a6d4e8e4818e24a3a781c2da768f42bba2f44d5e84fadbad7dba669a94bb9132fb SHA512 79b57e3f8af6f135300441670dcba927843182518c070d6767bc3c866a9fdfdd0bcf9be14c4cd5a1d9d51cc592a443c0c02af635942d7e30bf4adef34d558c45
 EBUILD compiler-rt-10.0.1.ebuild 2770 BLAKE2B 68ee449ac28f519a2cc0ec03b73aac5c770064f0350b5d1803a861386ac6b295947da9362b26dd6cffd90985f429beaf382ed949fc56da32184c9dab3aaff843 SHA512 2aea27ca4b4ccdc9c295b82c5e19558653945f87aaca03e50158a584044f8b0694f99ceb6c27e9fc5eb4e89cbc7851a4953e5a0a1494a49c46da7079962e3b14
-EBUILD compiler-rt-11.0.0.9999.ebuild 2758 BLAKE2B 16f7a9c549f1c6538057dec55122e9d400e57b99947f7a53a61879da3d4787cb796108884556ded7dabf69ca6e7015c9d9baefa7ca068dd088f9696d9c18a843 SHA512 82b9a33477133e60f66bf48199bf4ffca1cff5b709fc743d11c60cb42372123185229ab619a708d22b31479b4cfe64cc977a6b38b4029ce5e9182e3cfc60f8ae
+EBUILD compiler-rt-11.0.0.9999.ebuild 2760 BLAKE2B 917e1260aafc22fa4193d4881e52a4c686d5a8673f6958261986b02f3987f159206843e3b62221e2a2af53192f9ef905c9edcf7311befbadb55c9a4b883525f0 SHA512 91498187bf9629e9f58e4b090cfb237c548c4f08b7a284d3a5df29d6803efd9aeb352a4ef6c6ddb23b9bac2f22dd0a06c75ac7039addd1ee920d08fc3a84cfa3
 EBUILD compiler-rt-11.0.0.ebuild 2829 BLAKE2B 8fbe88d2cf7cccfb5f76930138c9f954000815a292d170381ec05ca02f12442d92275b95854b87cfa01dcadd57723d23a590a0bd9d16eae834b5303677fcc882 SHA512 2bf4954c0a8477a475534ec09b33ded11529f72e91ca95d71b80e7ae8a94b48623e69c4c4b5f8fd495813a91cc9989671ca97fde355e2c904894d05947a990fc
-EBUILD compiler-rt-12.0.0.9999.ebuild 2758 BLAKE2B 16f7a9c549f1c6538057dec55122e9d400e57b99947f7a53a61879da3d4787cb796108884556ded7dabf69ca6e7015c9d9baefa7ca068dd088f9696d9c18a843 SHA512 82b9a33477133e60f66bf48199bf4ffca1cff5b709fc743d11c60cb42372123185229ab619a708d22b31479b4cfe64cc977a6b38b4029ce5e9182e3cfc60f8ae
+EBUILD compiler-rt-12.0.0.9999.ebuild 2760 BLAKE2B 917e1260aafc22fa4193d4881e52a4c686d5a8673f6958261986b02f3987f159206843e3b62221e2a2af53192f9ef905c9edcf7311befbadb55c9a4b883525f0 SHA512 91498187bf9629e9f58e4b090cfb237c548c4f08b7a284d3a5df29d6803efd9aeb352a4ef6c6ddb23b9bac2f22dd0a06c75ac7039addd1ee920d08fc3a84cfa3
 EBUILD compiler-rt-9.0.1.ebuild 2916 BLAKE2B 4725960cfa3ff697f1b17d709c7a9f463aa8aaf2da33592b6c5d129fc4acb51181a4712c1afce01c0b97e441685cc5932524f02cbacb339f5c7c315813e4ec72 SHA512 2b038aeb653043691f046ae2930cac58ada17ece1f7da2699e1e9ce4dbe1903f21366ca82cb3d08605875f0b24fc0a9707bbde2ea6a039c080f0d54268071f0f
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
deleted file mode 100644
index a4a199c2ed96..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
-	python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( compiler-rt )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+clang test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6"
-BDEPEND="
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
-	${PYTHON_DEPS}"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	use test || return 0
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	local nolib_flags=( -nodefaultlibs -lc )
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-		# ensure we can use clang before installing compiler-rt
-		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-	elif ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-	)
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# disable use of SDK for the system itself
-			-DDARWIN_macosx_CACHED_SYSROOT=/
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake-utils_src_make check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
index f913057ff615..38a2cbc81fbb 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
@@ -8,8 +8,6 @@ inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( compiler-rt )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
@@ -26,9 +24,13 @@ BDEPEND="
 	clang? ( sys-devel/clang )
 	test? (
 		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+	)
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
+
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
index f913057ff615..38a2cbc81fbb 100644
--- a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
@@ -8,8 +8,6 @@ inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( compiler-rt )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
@@ -26,9 +24,13 @@ BDEPEND="
 	clang? ( sys-devel/clang )
 	test? (
 		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+	)
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
+
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index d2bb016843cb..b94309b05056 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,12 +1,10 @@
 AUX libcxx-3.9-cmake-link-flags.patch 1014 BLAKE2B 8e86059e00a5ebcd7a1528882876607c80ab14bcd0ebf2c8dbec87f71a48761e6433ff94db92b41192edb6e3cc74972cd9fb518f18a657229bd30afa3a65bdf8 SHA512 5df85c66bf865900197effe3905976bf165b4c4d79b8d14352753f6baca93ab5dc26bf735fd9478a0c13df489b860d8b629240134b7e26be6233138ea95dbab3
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD libcxx-10.0.0.ebuild 6080 BLAKE2B 51e502d81dfd67727be527ed485ed932893cfc321ba49259873dade51218a4278b20941c14a970d995b80e71e0307230ec9a6107bb0b0a8003d92c00ab419834 SHA512 f1c43ea15b0f894586c032813b9ad5cc07f41bf0dce1f84e246212a55aaa40b377819665fed2d46eecafb16f0f138aeeee5903e2925b306253dad5e8571e9068
 EBUILD libcxx-10.0.1.ebuild 5967 BLAKE2B 2e31f12ce656507bae063f3ec199ec485e2cd0e67346b87ba1ab4d57acb4f89d6c1f79d76ca305c470c1160414833ea727f62e9128ed5327dc81b06b27b9e58c SHA512 70ebbeeebdae6f4ee82cbe9d78e6c823535ea38c6cb84411b379962ee6ae93a0c495dab4f051bc5722257211e3d8f3997361dbcf383a6f46edfea1510d6a217b
-EBUILD libcxx-11.0.0.9999.ebuild 6050 BLAKE2B 8dcbaf5b852eae883d106ab0fa72729546f459acf65b46465b9cc60463395b71f48df8bcdb681800f020ed9a837a1554ff1b7f45c51d6d10f40398c25713dbc2 SHA512 bc01c6fa5d899d701965a3b893e84113c6384e9433c63f9be32d42209693557c1ef9128a75ebfd6c4e6a7835858c338367cf82d71127ec645d340f67f7b81816
+EBUILD libcxx-11.0.0.9999.ebuild 6051 BLAKE2B 073787f1a880a85bda48d8f9d8de9140b3e240c554b9fc5a822037d4aed0d47fa6759c9fe01f43a42a37458dfd451ff7676f88c48f3bc8d48c010f1361a2f492 SHA512 807f943e94677bb161b2c479e85ab75fde4747302c6b16e63ab45156571bd50edf0a27a8e5cd765ece20937564f0b24acaa63ce285d21e3a8901530da961bd5a
 EBUILD libcxx-11.0.0.ebuild 6069 BLAKE2B 8754e5f4f0ba11aac052b7704a5a26f7a6bce3f739a87fc5920ed979378c866506eedcb8e3c0ea29d110ea1e5664f8f753980cf61d029c0a117b62b682cf5743 SHA512 d7de5d4ed5815f40f75ea544decb6ccdae56f8093dcf8ceb58264d8ed955b943485d6a2c1682a88da7049a4acb687c89fd941f842a147a0415aa4e622bf752dc
-EBUILD libcxx-12.0.0.9999.ebuild 6050 BLAKE2B 8dcbaf5b852eae883d106ab0fa72729546f459acf65b46465b9cc60463395b71f48df8bcdb681800f020ed9a837a1554ff1b7f45c51d6d10f40398c25713dbc2 SHA512 bc01c6fa5d899d701965a3b893e84113c6384e9433c63f9be32d42209693557c1ef9128a75ebfd6c4e6a7835858c338367cf82d71127ec645d340f67f7b81816
+EBUILD libcxx-12.0.0.9999.ebuild 6051 BLAKE2B 073787f1a880a85bda48d8f9d8de9140b3e240c554b9fc5a822037d4aed0d47fa6759c9fe01f43a42a37458dfd451ff7676f88c48f3bc8d48c010f1361a2f492 SHA512 807f943e94677bb161b2c479e85ab75fde4747302c6b16e63ab45156571bd50edf0a27a8e5cd765ece20937564f0b24acaa63ce285d21e3a8901530da961bd5a
 EBUILD libcxx-9.0.1.ebuild 6398 BLAKE2B 0bf084d925f6633809763077300f2221bd7fd67f2d29b1f4febc436b7ff658c51deb7b614807eb9459f466a120e9f7420cf047a1f5583effd48544bdc51aa344 SHA512 77898701b515982851e2e49436705c9166f9c82c011b967b942f3c4f8d2466692e89883d18b28b1ad886692d37b02234a14a80c965c12fc2675fc40baacceebc
 MISC metadata.xml 731 BLAKE2B a6e96906bc2bff950c1b193b01feeb456b064fa585042566eae77dbe9a207bb08dfd083a3ab5fede2133a80b905a61c6dd541f9196e585c60b5629dd04a06213 SHA512 0a25560aa3eff5355137dadbb9cc48e384d2885b89075a97a8dafc7ac0ebe4ec5fde5b171a3416490264791a734c4405ec8a42dfc98e7e830c30ef0cfef58b6f
diff --git a/sys-libs/libcxx/libcxx-10.0.0.ebuild b/sys-libs/libcxx/libcxx-10.0.0.ebuild
deleted file mode 100644
index 2fdacef86681..000000000000
--- a/sys-libs/libcxx/libcxx-10.0.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-LLVM_COMPONENTS=( libcxx )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
-REQUIRED_USE="libunwind? ( libcxxabi )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
-# llvm-6 for new lit options
-# clang-3.9.0 installs necessary target symlinks unconditionally
-# which removes the need for MULTILIB_USEDEP
-DEPEND="${RDEPEND}
-	>=sys-devel/llvm-6"
-BDEPEND="
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-DOCS=( CREDITS.TXT )
-
-PATCHES=(
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	"${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-)
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# we want -lgcc_s for unwinder, and for compiler runtime when using
-	# gcc, clang with gcc runtime (or any unknown compiler)
-	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
-	if use libunwind; then
-		# work-around missing -lunwind upstream
-		extra_libs+=( -lunwind )
-		# if we're using libunwind and clang with compiler-rt, we want
-		# to link to compiler-rt instead of -lgcc_s
-		if tc-is-clang; then
-			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
-			   ${LDFLAGS} -print-libgcc-file-name)
-			if [[ ${compiler_rt} == *libclang_rt* ]]; then
-				want_gcc_s=OFF
-				want_compiler_rt=ON
-				extra_libs+=( "${compiler_rt}" )
-			fi
-		fi
-	fi
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
-		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
-	)
-
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-libcxx
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	local libdir=$(get_libdir)
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
-
-	# Move it first.
-	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=" libpthread.a libdl.a"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
-}
-
-gen_shared_ldscript() {
-	local libdir=$(get_libdir)
-	# libsupc++ doesn't have a shared version
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
-
-	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
-	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	gen_shared_ldscript
-	use static-libs && gen_static_ldscript
-}
-
-pkg_postinst() {
-	elog "This package (${PN}) is mainly intended as a replacement for the C++"
-	elog "standard library when using clang."
-	elog "To use it, instead of libstdc++, use:"
-	elog "    clang++ -stdlib=libc++"
-	elog "to compile your C++ programs."
-}
diff --git a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
index 8257e75c34dc..dd1a1a1f3a2f 100644
--- a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
@@ -9,8 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="https://libcxx.llvm.org/"
-LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
@@ -36,6 +34,9 @@ BDEPEND="
 
 DOCS=( CREDITS.TXT )
 
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+llvm.org_set_globals
+
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
diff --git a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
index 8257e75c34dc..dd1a1a1f3a2f 100644
--- a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
@@ -9,8 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="https://libcxx.llvm.org/"
-LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
@@ -36,6 +34,9 @@ BDEPEND="
 
 DOCS=( CREDITS.TXT )
 
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+llvm.org_set_globals
+
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 5c381620b835..179519ad927a 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD libcxxabi-10.0.0.ebuild 3390 BLAKE2B 708b1327f629ad4445fde37d53dea7807c433a2e3154f56f3fed4ba9eb698f3bb3e67055820521c58d8a31dc26abf28c293d709f97b4496ab420d788ab532c12 SHA512 18ab388b271756a5eb6dd1650d6a9f05a392b4e2cb48df92359c0e9ac763ecc4672343b4b51184f13c0636fe130e4a5972d8937866d34f1efec4b1addce1f81a
 EBUILD libcxxabi-10.0.1.ebuild 3238 BLAKE2B e2bd5189a20b8a2a575d1a660d97e7554527f03e4cb3c836b2f1c715bf42ce37250dcf2067639bb59f2c580fd3aa45f4217577ec41a1f4747a7e8397dde519cd SHA512 c6d03f55af65ca576d380497ff172dd3964e31fbc3fe1a8f49ae0b94364d6bf1819505ec5c4b1167744e0f11126cf22b4a8fbba03fff35017cf3963415a675c2
-EBUILD libcxxabi-11.0.0.9999.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
+EBUILD libcxxabi-11.0.0.9999.ebuild 3254 BLAKE2B b955ae412a6407b4f8687ea80d6d28ee0c7ee31d811e11002ce0b817b3f73bce6b8c4ca7f0020b8580c5e43e2fbb8364f3af373f812cf13f74b0334db41814a1 SHA512 7683c68ed72934a9c74e29b37b4a94af73f5607b9dc1857b7d1970c756654acc4176873e4201d11179f18b775306f34ffd082f532808837a118ff3e3a9517f59
 EBUILD libcxxabi-11.0.0.ebuild 3271 BLAKE2B 6e7960c213ef36f3be25e28fa3ad98d339180619c176756f60980e8ee1262912810542d28159b7d8f8e69ac09d937544b22c26e088788e315d2df4413be70f68 SHA512 5cb5357d5b96e9d1fd70610b50c8a68726a6678abbee15dcb9b4b5b626c1fb400a3f42a09cb52590387ea26d1ab41af62de40b4b26da35b7c4ccc75320c0c86e
-EBUILD libcxxabi-12.0.0.9999.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
+EBUILD libcxxabi-12.0.0.9999.ebuild 3254 BLAKE2B b955ae412a6407b4f8687ea80d6d28ee0c7ee31d811e11002ce0b817b3f73bce6b8c4ca7f0020b8580c5e43e2fbb8364f3af373f812cf13f74b0334db41814a1 SHA512 7683c68ed72934a9c74e29b37b4a94af73f5607b9dc1857b7d1970c756654acc4176873e4201d11179f18b775306f34ffd082f532808837a118ff3e3a9517f59
 EBUILD libcxxabi-9.0.1.ebuild 3390 BLAKE2B 708b1327f629ad4445fde37d53dea7807c433a2e3154f56f3fed4ba9eb698f3bb3e67055820521c58d8a31dc26abf28c293d709f97b4496ab420d788ab532c12 SHA512 18ab388b271756a5eb6dd1650d6a9f05a392b4e2cb48df92359c0e9ac763ecc4672343b4b51184f13c0636fe130e4a5972d8937866d34f1efec4b1addce1f81a
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
deleted file mode 100644
index 0812b96e62d8..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-# libcxx is needed uncondtionally for the headers
-LLVM_COMPONENTS=( libcxx{abi,} )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="+libunwind +static-libs test elibc_musl"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libunwind? (
-		|| (
-			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-		)
-	)"
-# llvm-6 for new lit options
-DEPEND="${RDEPEND}
-	>=sys-devel/llvm-6"
-BDEPEND="
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	# link against compiler-rt instead of libgcc if we are using clang with libunwind
-	local want_compiler_rt=OFF
-	if use libunwind && tc-is-clang; then
-		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
-			${LDFLAGS} -print-libgcc-file-name)
-		if [[ ${compiler_rt} == *libclang_rt* ]]; then
-			want_compiler_rt=ON
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
-
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-	)
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-build_libcxx() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxx
-	local BUILD_DIR=${BUILD_DIR}/libcxx
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=OFF
-		-DLIBCXX_ENABLE_STATIC=ON
-		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-}
-
-multilib_src_test() {
-	# build a local copy of libc++ for testing to avoid circular dep
-	build_libcxx
-	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
-
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-libcxxabi
-}
-
-multilib_src_install_all() {
-	insinto /usr/include/libcxxabi
-	doins -r include/.
-}
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
index 4b304417a9c3..c1992223348b 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
@@ -9,10 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
-# libcxx is needed uncondtionally for the headers
-LLVM_COMPONENTS=( libcxx{abi,} )
-LLVM_TEST_COMPONENTS=( llvm/cmake )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
@@ -32,7 +28,13 @@ DEPEND="${RDEPEND}
 	>=sys-devel/llvm-6"
 BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} )
+LLVM_TEST_COMPONENTS=( llvm/cmake )
+llvm.org_set_globals
 
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
index 4b304417a9c3..c1992223348b 100644
--- a/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
@@ -9,10 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
-# libcxx is needed uncondtionally for the headers
-LLVM_COMPONENTS=( libcxx{abi,} )
-LLVM_TEST_COMPONENTS=( llvm/cmake )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
@@ -32,7 +28,13 @@ DEPEND="${RDEPEND}
 	>=sys-devel/llvm-6"
 BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} )
+LLVM_TEST_COMPONENTS=( llvm/cmake )
+llvm.org_set_globals
 
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 73c2520eae98..98df75bbabb7 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD libomp-10.0.0.ebuild 3013 BLAKE2B cebd2bde8d98f6b4941f8c5000295424ee995ca2601224ae0ba535ae3fd327065688d481a498953450364b7725d60b4beea386f859660cac70292882365b8d79 SHA512 1938aff720e1e87fa290076f204feab09eaee1ff6152e65466fc1905a7afb03064a51ed39d3653d17ccf06a68344e2662a148d6913f7eb60797ded593146b8be
 EBUILD libomp-10.0.1.ebuild 2893 BLAKE2B e91e074bfa0d1584d40d997a1661507f404d6a6e4593e6da2a6825a1f8260ff02c4daebe4b9183d6ea025aa5c3be6986f3f7a920f578ad16d993ea10db272943 SHA512 558940389a55b5ea0e6e4c5b0fb48a8eaad5c00e26c1af90d5619106711b78341a532c59535f01ba5eedf99902af4494838b6edf5a0ade8693524d662d55053a
-EBUILD libomp-11.0.0.9999.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
+EBUILD libomp-11.0.0.9999.ebuild 2845 BLAKE2B 13c2ef4577d1dcd14f11d5100797a5bc936d9f02c0ca9814c63e4fd8b9e8c274404c8d672ededfd4b304c1c864a33c39d7b1c9f2b1c7c98c70008f809dbb3f19 SHA512 1552854a04dfc15e518a2b8234e64f1d6679638681023d4fd5690ca6577eec4f84b4ab64f3f211c20c9167be354549e2ab96fa2051dc40e66f1689caeea2d58d
 EBUILD libomp-11.0.0.ebuild 2893 BLAKE2B e91e074bfa0d1584d40d997a1661507f404d6a6e4593e6da2a6825a1f8260ff02c4daebe4b9183d6ea025aa5c3be6986f3f7a920f578ad16d993ea10db272943 SHA512 558940389a55b5ea0e6e4c5b0fb48a8eaad5c00e26c1af90d5619106711b78341a532c59535f01ba5eedf99902af4494838b6edf5a0ade8693524d662d55053a
-EBUILD libomp-12.0.0.9999.ebuild 2857 BLAKE2B ebe0d81c7306479129006e96b379edb4ee6b25e99e797ad67bd38847374aa1115d1053fd7ddca358d5470b8a85f56f414e9dc8b36a7cc8e99cd6d62f027b4d91 SHA512 28c58b66a3b9de6d6b1adc0a64172c1eceea2d95959801659026314b744643c3d47cb21059ee4dea61951ea2c77bff3e863bcdc43638c79bf50137a2a77abde6
+EBUILD libomp-12.0.0.9999.ebuild 2858 BLAKE2B 5b23d8c8e540decfa950bd795e0b3ec956307e9bbcd8aa67e9e7e574a0a0990987d8ad0bf2e7543bea128a052212f36bdc25d7d086a85092b1dade3ef1017f22 SHA512 f823e550a414fa30b23c2ac1ef1a53090bb0d547ae4ebbcecf227936e6f46d8dbdf23cc42b87cdbd009e5feddbad17a24b3bec065043a1460812258b74d89e66
 EBUILD libomp-9.0.1.ebuild 3011 BLAKE2B 33ccc441765ab33b61c9739e999039b24437c6f79b89a4db5ee1575b072fd3af609d5c8c583331db81b0b5a24a2a85cc359b4df312330b5732a24c7a8ebe3021 SHA512 404f3df2df27e031b59c4f827b13b2d9ce2b6af4126abdd1d6a233cfe0ec26ede61d01ddf6ca3434b6698ac6407ce8b4a845070b875f92eff4d961280c95ed5a
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-10.0.0.ebuild b/sys-libs/libomp/libomp-10.0.0.ebuild
deleted file mode 100644
index 3e9988c75e68..000000000000
--- a/sys-libs/libomp/libomp-10.0.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-LLVM_COMPONENTS=( openmp )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cuda hwloc kernel_linux offload ompt test"
-# CUDA works only with the x86_64 ABI
-REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		virtual/libelf:=[${MULTILIB_USEDEP}]
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	)"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	offload? ( virtual/pkgconfig )
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-		>=sys-devel/clang-6
-	)"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-	use offload && mycmakeargs+=(
-		# this is non-fatal and libomp checks for CUDA conditionally
-		# to ABI, so we can just ignore passing the wrong value
-		# on non-amd64 ABIs
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
-	)
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake-utils_src_make check-libomp
-}
diff --git a/sys-libs/libomp/libomp-11.0.0.9999.ebuild b/sys-libs/libomp/libomp-11.0.0.9999.ebuild
index 5bffd6685f64..f715bdea5353 100644
--- a/sys-libs/libomp/libomp-11.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-11.0.0.9999.ebuild
@@ -9,8 +9,6 @@ inherit cmake-multilib linux-info llvm.org python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
-LLVM_COMPONENTS=( openmp )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
@@ -39,6 +37,9 @@ BDEPEND="dev-lang/perl
 		>=sys-devel/clang-6
 	)"
 
+LLVM_COMPONENTS=( openmp )
+llvm.org_set_globals
+
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
diff --git a/sys-libs/libomp/libomp-12.0.0.9999.ebuild b/sys-libs/libomp/libomp-12.0.0.9999.ebuild
index eefd40f7c1f0..2164682a260e 100644
--- a/sys-libs/libomp/libomp-12.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-12.0.0.9999.ebuild
@@ -9,8 +9,6 @@ inherit cmake-multilib linux-info llvm.org python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
-LLVM_COMPONENTS=( openmp llvm/include )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
@@ -39,6 +37,9 @@ BDEPEND="dev-lang/perl
 		>=sys-devel/clang-6
 	)"
 
+LLVM_COMPONENTS=( openmp llvm/include )
+llvm.org_set_globals
+
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 37a2d1dda49e..8774aa751bba 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -3,5 +3,5 @@ AUX libxcrypt-4.4.12-pythonver.patch 616 BLAKE2B 73c7039127b23c075a7b8e5bc897299
 DIST libxcrypt-4.4.16.tar.gz 480694 BLAKE2B 0e93c2ff45a8148f82a80a67fb732a3ef42e87505d19258023f91d3352a382483204e77e2704e7a0de15f4f1e38a326d0867506a5580faf8c81857270588a4a3 SHA512 e1d3b1262c6be7c6c8847b8c4eb8191d9e5e482798be6f1186876c72f3d8c737124378ec45a38aa464f556e10a557b96f855bd371f03c3611eada27904bf6781
 DIST libxcrypt-4.4.17.tar.gz 519096 BLAKE2B 12cbe3d1f235baddd8d2ec8159f2a7514e75c2f91cf0db18ef909ec11c38ac19efebecec647a90cafb27c7ebc7e940da448ca8f3edd1c49e5cb9cc4407d5198c SHA512 94aaba6ccf9b6d1a32f9a571ee32261cecd393d5b8d8c6f18d740dc7bb29ac0fbd381124e7f0d84882559bb634208c08151b3dc05c9138fa0a229c4ba20fb6f7
 EBUILD libxcrypt-4.4.16.ebuild 4194 BLAKE2B 2db05b3f147b69116373aa37f83591cf9eb82dabe4ee57dcb2c39c41df7b76107e43054ea886589d6f3521a57a4dffb3ba7de9eb259c431f7375fde4cfb899f7 SHA512 288c81206e0e3c32901bacd0ce5d8b96275162801dddaed62490615297df7628f80193bfd0f36c1282d052377f4360e2e77679ffa29f7f403ecb1cd66df440fb
-EBUILD libxcrypt-4.4.17.ebuild 4232 BLAKE2B bebe32789a8f01e510d6bbf40853a5c3790289673d4911797b258a1f5660b3fbd430030b81a5d3833024ec30c85a8ee633c893d5e6896ab654b2108b8aa2b463 SHA512 68ce0fd1baacde4ed8f5691bd9111a7edfea9fe1baa536e8cc11edd053625907b0e16188ebea04365181dbf483f7130c527f308264b3a909608c8c7570a1e1e5
+EBUILD libxcrypt-4.4.17.ebuild 4238 BLAKE2B 2b5c621b88fe7331611762d01d51dd6cfce5b6661478354b31c3063a05b702fa7e3473149ce6735f418e3f2903fa236359b0926dbce67c51f09744d8648b5d17 SHA512 65a051423d5d561959ad1d3d0f739bc8eaacf750d84c46d42bed3220e0598541ebbdb043be1e9c56aca9d20cfaab99763c60fad096d935badd154994a0f186a1
 MISC metadata.xml 856 BLAKE2B e9fea1aa08f5b3f0abdd4d490973da2f133ea90e3a366d4549361233f51e674cc646b2fb6b4b15bca72d5a4e3b36be9a06e55afd3a4cb8f439d3958f09f8af25 SHA512 862cf3201efbecfc23167ecd1f6798f6729ba4e76749c174d17baf8aa4887f21d36f40234f35bc1b896e4384d110033b3f2260f01930b926f759e0243039adf8
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.17.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.17.ebuild
index 7a6e7573442b..4a205f091f7e 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.17.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.17.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/besser82/libxcrypt"
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+compat split-usr +static-libs system test"
 
 DEPEND="system? (
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index b43d83cae025..efbf80e5d3fa 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-libunwind-10.0.0.ebuild 3356 BLAKE2B 761c9fcfbd3dc5689521f7423e1bafe4f673d7c6dbd397f6b6e0f4bc168495f3eea513c0550d20a60cf1e4e38200df59583cede7bfaad4c574f249e532fe4bb2 SHA512 82f4e6967d73ae96199a507081cd9cc913a4e4b2b0c45caa0b27d428b68262df76242d318327616bb5112d97ee68fec1061485f94f0137fd73a0fdaad998707b
 EBUILD llvm-libunwind-10.0.1.ebuild 3186 BLAKE2B 11f1a597295754131e37decd729a0583405885910ca915cec77fe0593452164d217f7205ea0ead058c63779b9b0eefb92d2b0118cc764497483a42db0f059ad4 SHA512 eaaff919522f581886c212c319e20056ad2554fb4499e17a3a9d4ea3dc2d12ec2c07ab2c4de300c38103f92f640887845c5368ee0eb8c8cc921454033e5936c4
-EBUILD llvm-libunwind-11.0.0.9999.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
+EBUILD llvm-libunwind-11.0.0.9999.ebuild 3180 BLAKE2B c28657a17c13d0542029afa1adfc0c93ef7527b27243c75d7e6cd8647b89a612b95876ca53e0c8035e5be6682121f64a1ca182cbecf43703d773ee4d9e278852 SHA512 9c7bb3b843ecb3169c85df3cfd9b821a7c6f9e11b777645fab0a0e5b9365dad974f578c65fe535e222034d13b03df3738dbe07ded84894f293da77fdf14b1738
 EBUILD llvm-libunwind-11.0.0.ebuild 3197 BLAKE2B b2bc45250b64e5db02e14ff2b8b24eca7a63f0b17e32ff11563a8191f399d90b61ad58349cb2d834bc64a95e297e89f60225761f800af72f7e93927dcdfbc395 SHA512 798c6001df7018d840c28da7a1d3063d5d3549c406b550e20120fc1ff9f337a1e88d4140a8b0eb45871e0eb4e3ad5943790490cf32b127525dd890142a7d294e
-EBUILD llvm-libunwind-12.0.0.9999.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
+EBUILD llvm-libunwind-12.0.0.9999.ebuild 3180 BLAKE2B c28657a17c13d0542029afa1adfc0c93ef7527b27243c75d7e6cd8647b89a612b95876ca53e0c8035e5be6682121f64a1ca182cbecf43703d773ee4d9e278852 SHA512 9c7bb3b843ecb3169c85df3cfd9b821a7c6f9e11b777645fab0a0e5b9365dad974f578c65fe535e222034d13b03df3738dbe07ded84894f293da77fdf14b1738
 EBUILD llvm-libunwind-9.0.1.ebuild 3356 BLAKE2B 761c9fcfbd3dc5689521f7423e1bafe4f673d7c6dbd397f6b6e0f4bc168495f3eea513c0550d20a60cf1e4e38200df59583cede7bfaad4c574f249e532fe4bb2 SHA512 82f4e6967d73ae96199a507081cd9cc913a4e4b2b0c45caa0b27d428b68262df76242d318327616bb5112d97ee68fec1061485f94f0137fd73a0fdaad998707b
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
deleted file mode 100644
index 782f15e8964f..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://github.com/llvm-mirror/libunwind"
-LLVM_COMPONENTS=( libunwind )
-LLVM_TEST_COMPONENTS=( libcxx{,abi} )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="debug +static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!sys-libs/libunwind"
-# llvm-6 for new lit options
-DEPEND="
-	>=sys-devel/llvm-6"
-BDEPEND="
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-	)
-	if use test; then
-		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
-
-		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-build_libcxxabi() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
-	local BUILD_DIR=${BUILD_DIR}/libcxxabi
-	local mycmakeargs=(
-		-DLIBCXXABI_LIBDIR_SUFFIX=
-		-DLIBCXXABI_ENABLE_SHARED=OFF
-		-DLIBCXXABI_ENABLE_STATIC=ONF
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-		-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
-	)
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-}
-
-build_libcxx() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxx
-	local BUILD_DIR=${BUILD_DIR}/libcxx
-	local mycmakeargs=(
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=OFF
-		-DLIBCXX_ENABLE_STATIC=ON
-		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-}
-
-multilib_src_test() {
-	# build local copies of libc++ & libc++abi for testing to avoid
-	# circular deps
-	build_libcxxabi
-	build_libcxx
-	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
-
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-unwind
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# install headers like sys-libs/libunwind
-	doheader "${S}"/include/*.h
-}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
index fff362b926dc..38385b9304f5 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
@@ -9,9 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
 HOMEPAGE="https://github.com/llvm-mirror/libunwind"
-LLVM_COMPONENTS=( libunwind )
-LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
@@ -25,7 +22,12 @@ DEPEND="
 	>=sys-devel/llvm-6"
 BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+LLVM_COMPONENTS=( libunwind )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
+llvm.org_set_globals
 
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
index fff362b926dc..38385b9304f5 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
@@ -9,9 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
 HOMEPAGE="https://github.com/llvm-mirror/libunwind"
-LLVM_COMPONENTS=( libunwind )
-LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
-llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
@@ -25,7 +22,12 @@ DEPEND="
 	>=sys-devel/llvm-6"
 BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+LLVM_COMPONENTS=( libunwind )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
+llvm.org_set_globals
 
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 101d1afa62fa..66d94cdf0c9b 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -3,5 +3,5 @@ DIST tzcode2020d.tar.gz 260182 BLAKE2B ddf00c3a87b09de52f9ebb8ce8141ca22c2cec534
 DIST tzdata2020a.tar.gz 397245 BLAKE2B 2a85a9a9badbf2b74ba2ace3f7fd436cc7752202557785be503c1c8f2f698dfc8cfb412b3f08ebc0bd4a8d0e27293b47eeedf937f713dadb4386dad14322b871 SHA512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
 DIST tzdata2020d.tar.gz 401479 BLAKE2B 0136bf157e9a97fba56a02a2a495be19cc9b2008c6106eb9d4f4af13cb24848bd72e7e9c0182ca4643819a95ecfdff8750ff199bb2d1f9a560b4cd6685b41e50 SHA512 362e4569a666b0776614be3f63f1fe3d5ae259055e7051c9875f36023db9c52b0c5a10c19067114443a4cf2bf92475f8a0aebdf79bac836d967527fcdea4e9b6
 EBUILD timezone-data-2020a.ebuild 5200 BLAKE2B 3db29450f1cd759b3cb5cd1c8f45dd8ad4663aad1928c10bd3d81220f650ca76f859e6d220759cffcbde9d36f3e203264ca26793318b69fcb93bbcbabd50387f SHA512 9c2bb39c24a32a282abcaf345ef87f41fcaf8ed878ab6e5a2d814d982c8ffa9bb9b0b8f0081f1a2494e2862a11dc79d6df6e2abda41070cb12743e330c83a505
-EBUILD timezone-data-2020d.ebuild 5409 BLAKE2B 774e9c0a7a6f53e030a7da195e9b397bef67ada0d5fdddb9a815945ecac7ad821e9f3b42ddf2026ef5df55eb13081d208fb14c1d0d56546bdbfaa3854920ed80 SHA512 36816b0eda357de8cc726d3f78c31577e89d0efd04b4ed8be9dd175737ae83cbe19f013108cee85e5083098a3fbb5d7008834787f99b873e9919a14ce02cb11d
+EBUILD timezone-data-2020d.ebuild 5408 BLAKE2B 9d0d58c4b7e0011926489c0348edc61dd35854f6e0924afe17dcf87a954f780750dcf5b32b4bf9bc86832aefb60ae984fd3ccf027ffa06b6a87baca3ee7a700e SHA512 d43f7489ae798a741c48dff3d719912cc4744531a64d375eacf12ef670eb657fcd32c3e5eb624cf536f112fa92bf27068bab92e300131d14dfca248c2d5ab96e
 MISC metadata.xml 728 BLAKE2B b390f4f3d184c7f424d97a36883c9ab67f56a2445d6ecfe6deca69d42864b1249fa2fec6a48bf693f9b2101c167597e5a435cf13a8797784e8f37ad870bf3daf SHA512 36e2c2fa026441ae4b21d33b9425a7195c4d4d404e8f010e9bf894be3095b0d461079a87126f22c398475652777301aa5dcf151b195502d25b4094420c56c7e4
diff --git a/sys-libs/timezone-data/timezone-data-2020d.ebuild b/sys-libs/timezone-data/timezone-data-2020d.ebuild
index 8b4bec52eb7c..b2c731d4d8da 100644
--- a/sys-libs/timezone-data/timezone-data-2020d.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2020d.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls leaps-timezone elibc_FreeBSD zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 897e5908e63c..1d7b27e3bc49 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 71d385343552..2d6537d0d6b7 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -3,5 +3,5 @@ DIST parallel-20201022.tar.bz2 2103301 BLAKE2B fa4b9f02e5de8e876d42c1673ded47213
 DIST parallel-20201122.tar.bz2 2108900 BLAKE2B 97c49d5a17732db25307bf6f2e74451e8364c19e5253e4bb03736234397126f89809447b3cb6b343b315b512c2d2b578e7d2bbe2d5aa3e39f7eaf2cf40df0372 SHA512 58d6d41294418522db2d143ddbbf4d8cc47a3ae8a66f9f36d77396c230098386de9952a3b4d7db9e14470e36834be7d1995c5dda219ae21a72ea959f27d84e64
 EBUILD parallel-20200922.ebuild 641 BLAKE2B 2859b0f6f674b6d5140c041dc5c45f60258b026d6f46289585ea8b35b68f2cd43dfbcdc6982fb04a487ff2fa9efb09bd7afb5b643801b0bf950d426cbfb17357 SHA512 5d9c1bd8ebffea2705f61df62a8ad0ad8d498b1fc73e625734f99aec15306fc26b878d84770f5ee9e472876e41a61827b3e1b0fe43f65fe826e327175f2f5495
 EBUILD parallel-20201022.ebuild 645 BLAKE2B 5c54303f4c0b27a87ff49a3eab23fc0b04023928caceb1d037012f7558638a33d2caf620584318e3f9b1ec3ef6b697bc675531405aee0963762341b6a005610a SHA512 44a5a316fcec398888708c467a097fd1ae304735a1202cd2f2bbaf34ba7e20f99c6b926da13a1e433aefe61dab92f6ae2b1ff7864d294a844e60a5e8f4186121
-EBUILD parallel-20201122.ebuild 645 BLAKE2B 5c54303f4c0b27a87ff49a3eab23fc0b04023928caceb1d037012f7558638a33d2caf620584318e3f9b1ec3ef6b697bc675531405aee0963762341b6a005610a SHA512 44a5a316fcec398888708c467a097fd1ae304735a1202cd2f2bbaf34ba7e20f99c6b926da13a1e433aefe61dab92f6ae2b1ff7864d294a844e60a5e8f4186121
+EBUILD parallel-20201122.ebuild 656 BLAKE2B 77f738e23c46c022e67ba8c7eea3607950930e1c2e9c7041e5d6870232a83e87e56d9e31b73a3a0f144e54405117035d0c58f356f349b16184e93a6644841c19 SHA512 335eacb025371ecb9025f1251a23e6de4fd247a774ad320fd1461e197f086ef52a104b6e5d0f7634f3502308c39e012d4a0a0e56e61246bdfb45b6d7e6c7ad8d
 MISC metadata.xml 1077 BLAKE2B a636be1d6e6e4861e156561d8670e0c07ae27657e2ddf8cac3a6d9dfcb3c637931fe95daf998dc93fac1ab2a31d9ae43e73469a2882124fa8e229f1c7bf55d06 SHA512 5cfcbca8d00c6fd19ef2ad24fe6f23d3e02164b31a330d0ab34a739a8a4152f8d8df31a42c563d0b482a94519bdc4b0d92182b04d6937dd98f06bcee3726493b
diff --git a/sys-process/parallel/parallel-20201122.ebuild b/sys-process/parallel/parallel-20201122.ebuild
index bb83ea03aad4..f34ceb2c2293 100644
--- a/sys-process/parallel/parallel-20201122.ebuild
+++ b/sys-process/parallel/parallel-20201122.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 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 ~x64-macos"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index e314563bcc74..f30cfc778e64 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/perl-HTTP-Tiny/Manifest b/virtual/perl-HTTP-Tiny/Manifest
index 0dd1dc8cdd24..2ba613c4623c 100644
--- a/virtual/perl-HTTP-Tiny/Manifest
+++ b/virtual/perl-HTTP-Tiny/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-HTTP-Tiny-0.76.0-r1.ebuild 461 BLAKE2B c98d8ffafb43419cb6232172787fc19a3fd12624ba45e8d35e34973ad93def990111bb3cae849e2ff8bb076f061ccac8ea0a7d4c37ec33dec1aad5412dfe9c79 SHA512 3a55b117b2d3c1d476d2204babcb0c7a17b3c0edd4cb991cfc8cd704ce019f9cb4196e5bb20da3edcb54d0cb6462761df485e05e9c11ef207b7975acaf5a71d2
+EBUILD perl-HTTP-Tiny-0.76.0-r1.ebuild 472 BLAKE2B 214da71083927e6f444445693158d82cefe742ade3452a1527d2b42f1f5826789f9aa9dc5c192549b59d3df85cdc654063d44b5e8debc0eef81a8fcc46286659 SHA512 ea6e6ff77a8c2fab0ae543dd33331d69d8a7695d16d42262c8d5b915c5bbf3b6f804e466856ab9d5def55fd7796f21b862e82727dcb189d492e53815b571d594
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r1.ebuild b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r1.ebuild
index f9f0dc63585a..5a6bc7876cb4 100644
--- a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r1.ebuild
+++ b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r1.ebuild
@@ -5,7 +5,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/tmpfiles/Manifest b/virtual/tmpfiles/Manifest
index 267a9da0dd1c..517f65ad0cc2 100644
--- a/virtual/tmpfiles/Manifest
+++ b/virtual/tmpfiles/Manifest
@@ -1,2 +1,2 @@
-EBUILD tmpfiles-0.ebuild 500 BLAKE2B 5c0e7f6dd68b962898795646a223ea1b7b4296c7c90baedb26325735a3f011e4433d437bf79b8d1c462019326eaf9278b53ae8bdac233119a11ffd85ed6d78a1 SHA512 5a0f6e83d1a04743954d185864a9bfb6bc723fc2bee417f45013ed95448d3fc4c324dc2c526bea2bab783db583382572ca2b21d25a1e92a25091861f2e23c867
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+EBUILD tmpfiles-0.ebuild 500 BLAKE2B 2caba4a5f549166deccfe8b056607886e9d20dcb2fb9c446f592738a0cfd500fd2b6ebb4c591de04353ebffac715328c99823e9e08e7e74bd325148d0eff4839 SHA512 c240e464aa70138c95387e912dcdc22c9fecce619752443d84dc5f7c0044af65c5fa2948b620cf57ebaa9bd181ca9d0a22b7d27366726f094cd95c014f07bbec
+MISC metadata.xml 360 BLAKE2B 63ece8e18e4de5d9f634a4288b938f170c0ab2621fdd2d0b45a10454f36c1e0d8c7016597e56094a5e4077b496d9211506746089ea20940e19d8a1f33d710173 SHA512 65524a4582bac581e6d1648503c91c2fc9cf706fed28fc4127ca049db35b2eec63562b297ec754deb8abe7818b48cb679d632274e86caa8ce547b4e20192e433
diff --git a/virtual/tmpfiles/metadata.xml b/virtual/tmpfiles/metadata.xml
index c36c37139fad..31fdc85ea653 100644
--- a/virtual/tmpfiles/metadata.xml
+++ b/virtual/tmpfiles/metadata.xml
@@ -5,4 +5,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/tmpfiles/tmpfiles-0.ebuild b/virtual/tmpfiles/tmpfiles-0.ebuild
index 24280945e490..61cd468db1ca 100644
--- a/virtual/tmpfiles/tmpfiles-0.ebuild
+++ b/virtual/tmpfiles/tmpfiles-0.ebuild
@@ -9,7 +9,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 
 RDEPEND="
 	|| (
+		sys-apps/systemd-tmpfiles
 		sys-apps/opentmpfiles
 		sys-apps/systemd
-		sys-apps/systemd-tmpfiles
 	)"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 3f9bca83ce3c..d0e4ee74d8ad 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index d45203d01e21..675d2e82be4f 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -103,7 +103,7 @@ DIST firefox-78.5.0esr-zh-CN.xpi 564767 BLAKE2B b5c3e773c3bc58ba80180bd018467df1
 DIST firefox-78.5.0esr-zh-TW.xpi 564724 BLAKE2B d55faedb630ecc2629d1e2b1adcfd4cde51d119fd4599d25ef0800e5875efea65db5102fec36366b6531791f16d0f94e8e0dee0bdc18868ad9bf5208471d65c3 SHA512 95e4fa378cf07927b13a9b0e9d37d6320c4cba26f26df6dfab65fcfe1ddd21d38cb5a387663c8c96b6b3e2015999af4d355c0b672848f874101c998abd117047
 DIST firefox-78.5.0esr.source.tar.xz 333995288 BLAKE2B 35140afb6b4d15052858e7864753ca74099edb24ed5e459f1f48114f0946f5e007486b5561ba9a545566033d71a69f0e6163dd17204cab717c441323972f089e SHA512 0d16013342b6e8d67adb5c111177ea4796db4fb593da8aa254d0d95bdf33fad798c2dbb235d44db4177c32dd2d7b3ac26b938b476342753ee8d6c83d968d0281
 DIST firefox-78esr-patches-07.tar.xz 66156 BLAKE2B 8f69883432dcbd484b1fb15e3fde1630b1424e502ba78d9ec3cbe70cb2676a6876853d3477c8bfe35e92bca91b200e2d14543de1778d895676a52d2608109af2 SHA512 b4a01d3499002bd33a7fb45a1a80e9e73ba27a0986b6bfa43b3482dd8d82a686a14ae0c5e013402c8c8f359a642632a40bf4c362a0e83a1f53b453914f42e3a7
-DIST firefox-83-patches-04.tar.xz 151540 BLAKE2B cc51a844b41bef09a83f03d5d42f128528dcdb9506a9e0d6c570ddc9149bcaee56aecdb7e48d0bfe175bbee79e2dcf0a9042e5c1f9437b28869799e5ea738607 SHA512 329d01a0e67c9a77f19dfc0e5ceff52ae9ef6c1d6a02d895a641df48f244a69b6122da5d8b6e14d6fcb2685ea03a18c031c3d6a178012765537dfd420303c3c6
+DIST firefox-83-patches-05.tar.xz 151860 BLAKE2B 48377fb34eefe768f765ea5c5f450195d1a35f2c964271cf3ce6e34fcfb9c90d7d0578a37ca65c306a5e89d4e3d72aa44c07f7357fae3e1e40fb29b6d9017437 SHA512 05cac5322c7f9feb6a228797072572f163d320f3032f25664fe1251ad17a868373ee81d71971dd5d2bd3c7577498071d4f40713fc8251c3ab41654da73a94ed4
 DIST firefox-83.0-ach.xpi 463987 BLAKE2B 2173c637ae155ec474d18250adf8cd67ff7732ed9ecc7533004296934f82dfdd2f83f5f59dbd6b095b519bf5d3caf888f5e07913004a27771a13376ac080978d SHA512 cb1644bb1451311923bcbbbafe727fe8b35c33cf9643dceac603e802b82a2684451f9005ef6bfdd1ddebde01548926eb62dcd511e1f8a960248ea5b74f5f72e0
 DIST firefox-83.0-af.xpi 431349 BLAKE2B b4f912e706b464728e779bfc3cbdb7304bd763c55347140c32bdf309b3b4869ebc4bc1433f5cf5c970774f69aabddc4b5f5fce568dc32c50c4aaf90e9d07e13f SHA512 076e9084ae00dda0cfde5b09cf2dae7ed8994543c8de645a70b2f116d01da9e024159114d4d6ef21ce134b7d7cd16b95678121b41300ec5174a36112d41da4ed
 DIST firefox-83.0-an.xpi 511284 BLAKE2B 0b6332b8dcb254bf9df13fde4e34d01c2ef6398c329cce630a0b05a91b1f4ef02c8177f1726f489e8526ffd9fa9e822a010bfd6a669f5a598e7ed60f8328a278 SHA512 43559e760a96092b4c4bfeab6830f021e69c8c7c56a187f49109ea94443372e6323d503f1f175df1d77c685fcbbab2077f7fb02dd031804cde8a7dec2aa1d988
@@ -201,5 +201,5 @@ DIST firefox-83.0-zh-CN.xpi 564100 BLAKE2B a9b89639386f0775dd1a6ab99551a2e79fbaf
 DIST firefox-83.0-zh-TW.xpi 564079 BLAKE2B b985bd680dc620313cd217beffa87935a546e528a37854fb20a7f4cdebdbf50fd4858ac91f13bf31eca947d09de1a2a0b9956ddf5acb6978e3a7a7d8628be0c0 SHA512 d5eb2a32cf4a5dc675adae6590c5201023387df9a8854ac4814b601c413c3785ae2e694dc5b4d231e2d1686b386cde202066cd2f11c1071dc29eff81c51e3abb
 DIST firefox-83.0.source.tar.xz 351331940 BLAKE2B b3a805288f4d644f7375c78ebe771c26d59c57f6aad71877abbfe60563c06af5f162b8894cb624cec12a5c72542ffad97e6f8f0cfc3fba0506d4e246a41911e1 SHA512 4ac49cefed278d1f898907bbedacf81ea4bb4e5784f567d4c0971d9cbc2cf4a2e4472de81a7ded620bc3a516bc972d600b516b7674319cdfc9734c3824a9a2f6
 EBUILD firefox-78.5.0.ebuild 31480 BLAKE2B 28e48cc16ddb7884a7267b52db5a319ef91388ac107997f307c5197143b2382900a301821ad7c3fa3596c4f94080c98c773304985c33bce6eea60e36dfc6bcc2 SHA512 9a4070b9c3ca3b55323fff941047bec87eaa24cd843bd4b49e3afda7bdc96302e7988340fbbd5e3e03e588bb2d592c4754a258db5ce7abed8730a94e4c0eb222
-EBUILD firefox-83.0.ebuild 31429 BLAKE2B 835d122b97c80f4cd9f91d364474c7a26a1665e7c60448777efd9d73d4f49fdc62871d9fa34565c54177e3e408505aa9743ecf3ef1710c597f26533453e6a65d SHA512 42a5004d09c175646230342573cd23c4070884f2d93f9e76eeafd45997db131970050e02c9547d663eca0003569817c01ea64039682ed4ddf41d1e2c29f6b12b
+EBUILD firefox-83.0.ebuild 31429 BLAKE2B a6cd8d0417930f3ddd6140852bee83b77fcb48e0dbbd558f9fb10f97f85a81fa0cf987b5a85c4df801e26d5aca7c0b7658c6e9a85273075ac478a01d5d770645 SHA512 a61ec11e74bcd5244f56d89c0eebdba1cb2f06c64a0e1daffa2e3d55769135cac6f42aa5795215a1842439839e322719f1ed7796bf893f16e4fc2657c5e9f121
 MISC metadata.xml 2063 BLAKE2B 4c632fd591403d8045cbf3448fd459d82b0433351305fb12322b6a1157c279311ad1a9fcba9af4576f336035f841a95b82ee7a5602d62f1b741748df7443a861 SHA512 75bb3db236d0941e6632def252cb0b90cb374fc4f1dd66e499522e446c5fe8186f57a9898cdade933da205c12b0e70d4e1bdec0d8bfd9689d37d03667eb92f5f
diff --git a/www-client/firefox/firefox-83.0.ebuild b/www-client/firefox/firefox-83.0.ebuild
index d3e7b594f4bb..600da29c9394 100644
--- a/www-client/firefox/firefox-83.0.ebuild
+++ b/www-client/firefox/firefox-83.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-83-patches-04.tar.xz"
+FIREFOX_PATCHSET="firefox-83-patches-05.tar.xz"
 
 LLVM_MAX_SLOT=11
 
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 58c4d5329ed6..3fac2122fc66 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index 2a03cfaafbfa..62966eba3cf6 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -1,7 +1,10 @@
 AUX gatling-0.13-compile.patch 255 BLAKE2B 08de101796184625542dd339b96e246477a0cb8aaa40bac8640f0d442b9fba09389ada09bd4f852736487bfda30915f0ca562e1ea6aed0bee8d0104cb65a9c63 SHA512 77e35689b80a4d1b9598bf31cc14c3572a7b92d49ffeb98442552f58eeb04a196ce5c8215941d07e197191c349548d23baadac3b84854d6eb93d26632555c699
+AUX gatling-0.15-ar.patch 754 BLAKE2B 08ebd3714234ced36751d0ddcb0d3391aa8cbc0f91b215c87d1539f738b9aa7da53495e9171d24554a4a8e3afbfc6553a333228f5867efa18e387deb9f1293a3 SHA512 050bf557c8bbeed9245046d3f938a40c2b2a2d544c0c422deca5ecdea6683dd342a8cca6fcff2419af128c8c0caece33e4848cf2f3e754ebf225ca800f70820c
 AUX gatling-0.15-gcc10.patch 811 BLAKE2B 8d081b41df919e6cfc41113e24526e1ab59ea457cb46fe9da2ef6224965f3b89bf635e5c68533ad497ca8f7e4094d01a8167fa6f8ebc994108fc41375251d205 SHA512 409f683ae8ef25050e122e1e448fc0bf04ab1d7caafa37f040960f1143aa7c9c3c4a722229c9243301da21c9216e32da37ce4e4b9bbb8cbc65cc256b8e41bdc5
 AUX gatling.confd 659 BLAKE2B ac3a2bc798e8ee9172f7c807c7e80f5bc7ad12e1830f296f097078887e609facfcb6087c6d5cdaa162fd747d7f03d208a28ec30e12fb67e7dc938ed0e65f766b SHA512 e903cd9afbb575226c6de0da8ad673d4650a53cac7442505422c98c32a00457f3d48f2853355cd76ea0f83671cb973ddf90df900d86a15172291317109481fb3
 AUX gatling.initd-3 1970 BLAKE2B ba48e796b4fca2cd165756b3ef781feb47be18e43043d834e028d80b522f1fe6482db79bb89a7a7e57c1fdd80f6cdbb525ec0153af8600daf848d7408aa4ff6e SHA512 3b198ed6728add5f30e8ec16171cc7086d315448821b3a5487be1cf7b318735a77f0881d9aca0a5af179a2b8aff75fd0c0ce80836172a26c439cba2859c6ab1f
 DIST gatling-0.15.tar.xz 121804 BLAKE2B 7df5f6d4fc823e8a1252bacca2b57d0848dd3a920216d1d3185d5f471f786eee1eb36396114b367660ead816bd4ee6c734099bbb9bdb5ffbd5b70a59e0fb0667 SHA512 b76d220a0644f1e6e7ea966a4eff409964c564fc4a31c4efdb764e5f7b5857bc58c26bc31e860fe35df932cbd60fb2b0f4f21c75cb5aa56427e8a2a453684716
-EBUILD gatling-0.15.ebuild 1341 BLAKE2B 54874d628c7e706fa31a8430aa6fcfeeaae01dbae7f1f1141b3766ee0c97779ba8c5188c43a7480a1d1d753126295f24bbede1ec61a8e3639cab528d968a140d SHA512 de8d4d0b647c8909ceeb1da945028e7e39a585f1921accab3fe47c3e26975de06df8ea3bf34d6d3075755a178c4789e2876fb0f8c6b3b334f06720c3a16ccd2e
+DIST gatling-0.16.tar.xz 126844 BLAKE2B 33dd2e93833b216ffadae4dbd5650af87b23ed5d62caf181d8005acb4dce889b86d1afb711676377ba2b7c4fe08b8f2350a32965cf6292a268281b28c4310c27 SHA512 9446ea0ae862509b1a892e5bdef14d3a2320c3c3e846362b4679c0834aa906ab5b16ef54e4a7c8e7ee839d30317436dd411e891e3105035a9ee31b0facc0b8c1
+EBUILD gatling-0.15.ebuild 1370 BLAKE2B b8b28f23d4d301228dfcd147557060faaba81fac381c675366410aefb910025ee2d24b82d8c29043687d2dfd34aa636d031e15ad612cd5f0052b917ea404cf90 SHA512 68701a95f1c86be6a5892d714c814756bdd00ac7c5da9945a2f87dabb4bc828f8259aeae8ac4d9e5513b97959c49287311d0d25c96c8b0d73b6355b30a83772b
+EBUILD gatling-0.16.ebuild 1345 BLAKE2B d8bcdf687af648ccc301050859e31972082fe98e7691be1f843def77a2f88709a716d842dfa7fc3a6315575ea20fb85335ce5475c6d0523a72a93830075c9e8a SHA512 d724647ba744b628b214b7078cf4b8d56609f87a5c0365e03b191974720c6ecf9056c72ee9cb342c933ed58e553a9ec42f88ee331ca9878416ff9745c86a6dc7
 MISC metadata.xml 444 BLAKE2B dd65d9cb3f9b6babebc0e45c67e8bda05f48d49d8902f6a0da4d1d75f38ba2e1d627f0a1e9e35dac77466fd7edfe43435b7b99d7ee394268df1e4f5cc5b53ab5 SHA512 0f829523b85ea9fcd62743f72f7a985e532685d4989b0083191286cbc9a99db398fde3c63f86ad9bdeb6e75d559a777e85cf2df037456e5b0960b15c2511815a
diff --git a/www-servers/gatling/files/gatling-0.15-ar.patch b/www-servers/gatling/files/gatling-0.15-ar.patch
new file mode 100644
index 000000000000..84b13293e426
--- /dev/null
+++ b/www-servers/gatling/files/gatling-0.15-ar.patch
@@ -0,0 +1,30 @@
+From 64933921d28aa96cbece18e43723117661a8056d Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 28 Nov 2020 20:33:21 +0100
+Subject: [PATCH] GNUmakefile: Respect variable AR
+
+GNU make comes with AR predefined:
+$ make -f <(echo $'.PHONY: all\nall:\n\t@echo "AR is \\"$(AR)\\"."')
+AR is "ar".
+
+Original bug report at https://bugs.gentoo.org/756850
+---
+ GNUmakefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 6af7b35..e6b32fe 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -195,7 +195,7 @@ dummy.c:
+ 	touch $@
+ 
+ libsocketkludge.a: libsocket libiconv dummy.o
+-	ar q $@ dummy.o
++	$(AR) q $@ dummy.o
+ 	-ranlib $@
+ 
+ LDLIBS+=`cat libsocket libiconv libcrypt`
+-- 
+2.27.0
+
diff --git a/www-servers/gatling/gatling-0.15.ebuild b/www-servers/gatling/gatling-0.15.ebuild
index e59507c318fb..c18fb7fe8684 100644
--- a/www-servers/gatling/gatling-0.15.ebuild
+++ b/www-servers/gatling/gatling-0.15.ebuild
@@ -25,6 +25,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.13-compile.patch"
+	"${FILESDIR}/${P}-ar.patch"
 	"${FILESDIR}/${P}-gcc10.patch"
 )
 
diff --git a/www-servers/gatling/gatling-0.16.ebuild b/www-servers/gatling/gatling-0.16.ebuild
new file mode 100644
index 000000000000..c1b0e8bf0abe
--- /dev/null
+++ b/www-servers/gatling/gatling-0.16.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="High performance web server"
+HOMEPAGE="https://www.fefe.de/gatling/"
+SRC_URI="https://www.fefe.de/gatling/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="libressl ssl diet"
+REQUIRED_USE="ssl? ( !diet )"
+
+DEPEND=">=dev-libs/libowfat-0.32-r2[diet=]
+	diet? ( dev-libs/dietlibc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.13-compile.patch"
+	"${FILESDIR}/${PN}-0.15-ar.patch"
+)
+
+src_prepare() {
+	default
+	rm Makefile  # leaves us with GNUmakefile
+}
+
+src_compile() {
+	local DIET=
+	use diet && DIET='/usr/bin/diet'
+
+	local targets='gatling'
+	use ssl && targets+=' tlsgatling'
+
+	emake DIET="${DIET}" CC="$(tc-getCC)" \
+			CFLAGS="${CFLAGS} -I${ROOT}/usr/include/libowfat" \
+			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets}
+}
+
+src_install() {
+	doman gatling.1
+
+	newconfd "${FILESDIR}/gatling.confd" gatling
+	newinitd "${FILESDIR}/gatling.initd-3" gatling
+	dodoc README.{ftp,http}
+
+	dobin gatling
+	use ssl && {
+		dodoc README.tls
+		dobin tlsgatling
+	}
+}
+
+pkg_setup() {
+	ebegin "Creating gatling user and group"
+	enewgroup gatling
+	enewuser ${PN} -1 -1 /var/www/localhost ${PN}
+}
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 18f488edd522..fb7e538b1f12 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -3,5 +3,5 @@ DIST gunicorn-19.9.0.tar.gz 415774 BLAKE2B 1ac920e3a02aff434d2458cbcacd821df428e
 DIST gunicorn-20.0.4.tar.gz 373841 BLAKE2B d6f0b5b901697ebc6ee987af5766174a845de8bfad03ce95638ed087b92175e9b2f0e9a49fda70f8f9c6fdc15e1ef1a431c069270af068fb29780abcedf63fc3 SHA512 706620f165e36c178a6d3e65f51a9bb7746abd40dfc7c0f1b3b523771be953dd03b36111f192407aef474ad44afdffd11b6502e51376d11465ffac2255822d5e
 EBUILD gunicorn-19.8.1.ebuild 1171 BLAKE2B a8c6b1dcbb749db4dcf60b8c26111045be976f28559b2cb4a7f7ef1536dae320a0f7060bd572bdc2998dab0003230ad1688ca4c28130c70757702504222998e6 SHA512 ab4761df1c5e57b7aa87095de97915126007055a87cac29866a603604c47ef4f25886cdef723de8b36eccdbfd7b2ed835832b54b827ed3f27c97cee0c30a90f5
 EBUILD gunicorn-19.9.0.ebuild 923 BLAKE2B d6a784321f92ca5b2cc04f077a7d18bc24a1371867607b3813820e5089ce36f2f41ac38fae36b00fb1c8c2fbee9a36398624bc3823072c2eba50e3e8848f18c7 SHA512 f14c034ae4d0fa97483b80df04e5bba6ca4219b8944d38cbd43a21c91daafe001331985f1bda79fb9be81bac55db6fce2a64be489a91db37c723af452d563a7a
-EBUILD gunicorn-20.0.4.ebuild 896 BLAKE2B ad893afd1ce7d2ffff209cde9c3a8504342bb64641faa3faf6af3a650de04e9bfa6c3e35d44b2aab5be9226f004fdd3f5ed82ab3ee747d5cd8fc09a0fd0bef44 SHA512 71a83a7a0db84de931d1eaef3e79238f41e57f373c9fdb03115c641a521cb2a2d706d5cd117f151638ed78ec5f2cb498c264922c1cd9774b52585b65bf8707ba
-MISC metadata.xml 808 BLAKE2B d23e87c5659aed0bcb8a8719d3eb3a862ddff635b231ae01b3928cd6f33cd073b5b054742ed806a9dc408528c3a843a06e5db4c6a252beaaace6873d798468f7 SHA512 c420223f8e7f0b3ec1fb82091e38a85087ca814b16051dfd783e54d8af5fdb811086887a5f1e7177f8bcd37e098ab6244e3e8ecf38c6a3fa9941c2933b38e1c0
+EBUILD gunicorn-20.0.4.ebuild 907 BLAKE2B cb5256d3e4bf3d7bc097c2b63177fad79da135093d214dc1cdf37048913aa9648cab9f52d82ee1421ac98e8c0b88a7554b590f9e66a0c68aa7149e59df2e895a SHA512 e118083ee47c9a54cc8ed3ee03c5e0515d59876b1744681e07354379fe2fe5d68bea73cbde4cf6ca7cea033aefbab20fa5094aa2ba51c066b282e36cd1758671
+MISC metadata.xml 832 BLAKE2B 4f1f3fc1097c11b67fff558977c62f1d4e42af39bd50dd98a5553bfb8c42cbaa6286ade58eb8702f61926a2e0030d411fc2548c35e99140362fa77774b3a54a7 SHA512 74aa9e1b67aa4db3d1252ded571495c8e459391e4cf8f2054dfbd965d7eb38824994ebc1a31dcb4c1d3f33d1963fb32e5dd215c24685f0ad570170404d2115b4
diff --git a/www-servers/gunicorn/gunicorn-20.0.4.ebuild b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
index 3359e5c42105..719df38098a4 100644
--- a/www-servers/gunicorn/gunicorn-20.0.4.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2 doc? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
 
diff --git a/www-servers/gunicorn/metadata.xml b/www-servers/gunicorn/metadata.xml
index 63bf1bf57b34..9c401ff60394 100644
--- a/www-servers/gunicorn/metadata.xml
+++ b/www-servers/gunicorn/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for UNIX. It's a
 		pre-fork worker model ported from Ruby's Unicorn project. The Gunicorn
diff --git a/www-servers/sniproxy/Manifest b/www-servers/sniproxy/Manifest
index 3e192091ad73..1c9236202aeb 100644
--- a/www-servers/sniproxy/Manifest
+++ b/www-servers/sniproxy/Manifest
@@ -1,6 +1,7 @@
+AUX sniproxy-0.6.0-fno-common.patch 541 BLAKE2B cc1bb1edcb25bb12c5d5ac70088f38e61958104fbe4c81586c90f86dc3e1c53ea29de1aae82b7bbf17fea6e135572bc9e026b30a473411cbc09680b9eec20b58 SHA512 deb08ce08b4fc4060b5f2652b1946174a7771b81a9f288b9ec6368a50cfa3d327edef598b3e1fe7f668c4244adfbbc770644acab9772a451f1058e8362f71681
 AUX sniproxy.init 493 BLAKE2B 4021f98063b76628abd60e52afc3cef2d6860c3fd639c21d0e2d4a62acc6fe7f505bc715c69116474748c122d031a8df1f101d0c13b80524980911a6010fe86f SHA512 6dc6ba017c18cc5c4b15b2085e95157c396c44b8d368b6ee28c559c9d4072460604afca3a20c46c639c5b095a3da65e3b2b15fc20d738e41651cc77615dd3ca0
 DIST sniproxy-0.5.0.tar.gz 72654 BLAKE2B 11f2a66af0d5a19807178687b2a5044aa0cca18a9586c60a6e15604b90f4c32d16d9ac8d037df2cafe57a2dc3a576e1ff72b8f58b59e6822d2a45520b9c770f4 SHA512 52dbb217193d2b7bf9dea37b13fde395b5c56d0a6627508a245f2807920deb282aae3c1ae7e6b5fa68432990e48998989fd28027b65cb7310f214b29f98e5e5d
 DIST sniproxy-0.6.0.tar.gz 78515 BLAKE2B 1ac8decc793e7b3d73d833bc392b3ef035bd2ba7d515c54ff46de16ee8897c0c5392929d5c7a22a131c1f017897cc6f8e9c50aff8164e4afbdc23155b804b613 SHA512 8a99573673bdd57e528c5781cb166d39c80daed699382b24c3fa18a6011d074a1d9e470fee404d24b4450cf067c9995125910b2941b5216d88d189a1d79ebf73
 EBUILD sniproxy-0.5.0.ebuild 1358 BLAKE2B 85992e780c92ed4903e42e703c5391092cc5f2aa01868b4a160e8c260e2aca1d7af3e13f1af009c1f19fbd6cb3ccae956c421f78c3b81afa34fcbffc233f50a0 SHA512 0f0e254ce173b2c8f563db051cc2647cdad62b09d5fcabf82a43e172c11cdf3406146eb18da087a6ee306fef7299f115592c6d394f2cbcdfb95782b696a2c769
-EBUILD sniproxy-0.6.0.ebuild 1625 BLAKE2B 1dfd5f28a60401b8aacd4268c81c8050b03de3979bd1ff3f51dd07ea508f54798f1ad74c42a24ba0612111c5b749f6017e4a4bfbaf89fdcb2c671f4cd898d71b SHA512 1f6d965e68923d7793286a3d8611dd4b87dd3d08d52c8e2f7197ee968c56deffda3e7a5a30ee4c471f0cedac6313a3306594bb0ceb885bb5b6a9b7750078b8cb
+EBUILD sniproxy-0.6.0-r1.ebuild 1603 BLAKE2B 722ccab3459ee93ca63d6152d95c99ff097b7ee4f7fbf64f3f292c99fd8d9fbb489f5e98bcc15c6ffe8ee08957e2c7930b0b469c8e4771f7d0fae9cc1114b78e SHA512 ae52cac6a2b16ba32d0cc873283e5cb9e284b4195d51d4c17665b20e2f21f91247eba0039cef92c407579ef9b174fee98346954177604dad02d087e8f6bb1ec3
 MISC metadata.xml 630 BLAKE2B ebf3d19da137583e30cd2d19d19280c8f18c9e05beb0dc6a35d7863687ff9d28c4ee473ff9fbd97a05dee4cdc96bcb6785f41a22911a00ddc4645c20fc18f655 SHA512 263e1b4f405a67f6e402cd842d95640664c9f961ee29c614022787be76a2d83b5dcb3c4e784bef4369424680bdf1888d440eeb0a195dd8dfa65132c137a2fb55
diff --git a/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch b/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch
new file mode 100644
index 000000000000..f718bfca736c
--- /dev/null
+++ b/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch
@@ -0,0 +1,24 @@
+Taken from: https://github.com/dlundquist/sniproxy/commit/822bb80df9b7b345cc9eba55df74a07b498819ba
+Author: Pierre-Olivier Mercier <nemunaire@nemunai.re>
+
+--- a/src/http.h
++++ b/src/http.h
+@@ -29,6 +29,6 @@
+ #include <stdio.h>
+ #include "protocol.h"
+ 
+-const struct Protocol *const http_protocol;
++extern const struct Protocol *const http_protocol;
+ 
+ #endif
+--- a/src/tls.h
++++ b/src/tls.h
+@@ -28,6 +28,6 @@
+ 
+ #include "protocol.h"
+ 
+-const struct Protocol *const tls_protocol;
++extern const struct Protocol *const tls_protocol;
+ 
+ #endif
+
diff --git a/www-servers/sniproxy/sniproxy-0.6.0.ebuild b/www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild
similarity index 82%
rename from www-servers/sniproxy/sniproxy-0.6.0.ebuild
rename to www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild
index 458f1e8ac793..9dc8e5a03ef1 100644
--- a/www-servers/sniproxy/sniproxy-0.6.0.ebuild
+++ b/www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools user
+inherit autotools
 
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/dlundquist/sniproxy.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/dlundquist/sniproxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -24,18 +23,18 @@ IUSE="+dns +largefile rfc3339 test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	acct-group/sniproxy
+	acct-user/sniproxy
 	dev-libs/libev
 	>=dev-libs/libpcre-3
-	dns? ( net-libs/udns )
-"
+	dns? ( net-libs/udns )"
+DEPEND="${RDEPEND}
+	test? ( net-misc/curl )"
 BDEPEND="
-	${RDEPEND}
 	sys-devel/gettext
-	virtual/pkgconfig
-"
-DEPEND="
-	test? ( net-misc/curl )
-"
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare() {
 	default
@@ -55,6 +54,10 @@ src_configure() {
 	econf "${my_conf[@]}"
 }
 
+src_test() {
+	emake -j1 check
+}
+
 src_install() {
 	default
 
@@ -72,12 +75,3 @@ src_install() {
 	doman man/sniproxy.8
 	doman man/sniproxy.conf.5
 }
-
-src_test() {
-	emake -j1 check
-}
-
-pkg_postinst() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 -1 /var/lib/sniproxy "${PN}"
-}
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 965c15d5d114..d26c6777f74a 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -1,5 +1,5 @@
 DIST tornado-4.5.3.tar.gz 484221 BLAKE2B 7b3682fa85a7f6ad32351d40993516a3e397b7b0a5de9d807bcd8b2b21325a6170f3670cb13e12aa208b6590313cf165ddf40537dba1fee61fa9d71954265a66 SHA512 c17dd7a3b541c26950d27c8a399ae4fdff1d99d16ff0c5de9871fe2de4c0f797c96712b23b5ed5efdaee06bb251f7def114c83fe6f7f37f344cdac9996d14448
 DIST tornado-6.0.4.tar.gz 496204 BLAKE2B 6c092214d03baf5cf7615b780043e2fa40a4ed623b7ca59a2528cc3625ba904b21ef93c528278adedaf83e3b6e5a6311d867833dfe9826637e97918dee6fa334 SHA512 d29d69cf40f8b34fb2c55d81b6ecd9bc7c6fdf644eb4ff35452829510c0d5ec185da0a6067fec3e8afb2bedf9f5f08b06adb0ad53dcab04cb791a75abc304d6e
 EBUILD tornado-4.5.3.ebuild 1272 BLAKE2B 803fffb9d8b1568ad02836612c73aa1b9d4c8ab409aba395d6a7a44adb786f03145936328b650536c88564f66a5dbf337b587a30e03d092753fbc104d2dcab3c SHA512 089dacaeeb8fe14380d3afcf5a9ba91b580d9bd67559433f3143e5b73a7ad879367a199862e81494df279a38b4bb631718dbc8bf22dfbda65734bf8b5481c7e4
-EBUILD tornado-6.0.4.ebuild 1343 BLAKE2B fa7cd89bec971a2635de9e70e02d46f9000a08141bd4e234c7af64496642591aa55615f1e71325c7f961f480c94e2bab8b29184db67f8f324c683f1d2816da8d SHA512 7080bb1dcbc422298abf6dc52af7ddb311ff7834affb3d05afc66d05b154407581115bb7d5bdd8f69c61d06606a3cdc68f0862c635689d7d798cbbaf00fa29c4
+EBUILD tornado-6.0.4.ebuild 1354 BLAKE2B d7227f380e6a6b3946ad1b46403a7c18238ef45f2fdfac29e9c79a0d89ee9c7cc03018d0c7e3601b1fa0d70b3b0e71507703b7307f890fe29a1b47566b404126 SHA512 300bf8de0940a46a63297446f8b05c08c5825d2d74a2cbdd6710bd3d17c6d519ab6d25c955fef4abf7c7bf931cdf8b095dc324e02e6a040238346a5ab7825bc0
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-6.0.4.ebuild b/www-servers/tornado/tornado-6.0.4.ebuild
index e4e095338d49..2a7f9ddf4825 100644
--- a/www-servers/tornado/tornado-6.0.4.ebuild
+++ b/www-servers/tornado/tornado-6.0.4.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 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 4b65549561cf..5cc50f7426f4 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index b0185e224a20..a7750b249359 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -2,5 +2,5 @@ DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c
 DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad01e8a8a955600715c61bc5f27723a1b5f4a4624caa61bbe9bdca13064919116f5f08959db2622a5d6b097998d762ffd9cfc28 SHA512 62ad8d522db9aeea7bd0acc76c989a1d39e8be619847b294048530b2dfbebf5a5982f84daf1a5f49b0a8a7abe3234e1571fb5d4f5429b02867801015f30e4944
 DIST lightdm-gtk-greeter-2.0.8.tar.gz 583426 BLAKE2B ae06ebbc07efe5c0131c07b293671f24683699eb84f12222de8165428e935b98bbf9d1e107eaeca8f10e725a6a11c97d4f4c3d415ada0b0876b0b0a99f21d1ee SHA512 59cad69fd7f17b6a416944804be80f306ed51ee0c55826975c8564f432e8098043b677f6452e9afa290c6ef37ebdc632cd8b79e7a0a712a3407ddbf9f200b0db
 EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2078 BLAKE2B 5e4252ccc3d0fb4102a0f8741a051845cb9953b15004feeee6d62e22a6a385e3ee996da2ce4825e68312fa0bcb58be704e257643601bf9350e00d5d19b7689ef SHA512 8cb1c44379697de9f7328abb26ed83e18b3591dbc52eecd4f74ded1569f4daf44320d9d40dbe0cad547c4e9cccfdf5eecd9cbd7d79292172d02cb70426c989f6
-EBUILD lightdm-gtk-greeter-2.0.8.ebuild 2039 BLAKE2B 133128e7e1c9af386bd133c1c5fcc0a1b59cb6d2547f95076bd3452b5e38e7946e4c2e2648741fd0333c366b55b4ac0dc4f24ccb5214ce25048d0b8df7407adf SHA512 18b5f1b5d3e467b314a2c037ce789e11b0d51d7d9e6b2f5447d74fec668393cca10b764b27364961cf8b31f9f48af03e1333958abf4fe86b2ec3b66cac8a2ce6
+EBUILD lightdm-gtk-greeter-2.0.8.ebuild 2036 BLAKE2B e1956ef89615324916c7e64cbcae12d4b2bdbd1afa633d70287fa0cbe6105049fae958621c5f7bad47bcbc80c4d7627ec3033c7df81d929576e0e3db018f518b SHA512 98181491111cb95e37e8b5d0ee1c23234f67a04442360ffc74cda04c2c10b3377075369fe049bad87eb19b2f34332217fc840d88c956f898a676dbe04952a249
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
index a671662a7e34..a7aeadd0221c 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="appindicator branding"
 
 DEPEND="appindicator? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/xsri/Manifest b/x11-misc/xsri/Manifest
index cdeed52fb6df..5465f22a80b6 100644
--- a/x11-misc/xsri/Manifest
+++ b/x11-misc/xsri/Manifest
@@ -1,5 +1,4 @@
 AUX xsri-2.1.0-configure.patch 594 BLAKE2B 54f196a42d0c65abc6cb97726b2051716f9e2a39ebb124b27858bb0e021ed128402658dd92d70920fed05d18a9e9b485bc7702bc39f7233170e92e788fd08977 SHA512 2a6c86a1420cf05c123906412ee15b0ff6785578a162522df744f226612188f87b77294cc0792d170a0337f91a81e1c7130a24a8eb34ca534bfd4309f6297ec3
 DIST xsri-2.1.0-17.fc12.src.rpm 79266 BLAKE2B 56f269aae035961bb84637ed2fa282f91b3596f66b9e9aaee59ef1ef1b88da22f763a47815676e1e14c3812c410eadf145206f89facb4596db42a3948e7d6ebe SHA512 1e0948b4f03eef797fdef63732f592ebaa3aeff7010941c2df9ae0a3656a9c477adad48c72cf59531227f2427330cca13ae09c5c60739ec66411dcce10f44ee9
-EBUILD xsri-2.1.0-r3.ebuild 633 BLAKE2B 2d1173121c13b025a8fb014d0d2a89b4d0f6029e5a62f9b0208c98eaae2fbda89541204f0e6c62f57ee0496926ef46987c30f71ebbdbc96978a8567f68767e95 SHA512 bd7f0164b69907f6936c7ef4a612a3b08eebc9c230bdc74e57a4467d2574affb7640ba0860f3f8fbc124e791ee0fd72c8723abb405de7c6b5b7d8efea42b54a2
 EBUILD xsri-2.1.0_p17_p12.ebuild 816 BLAKE2B f8c9d4e3575f969f25c63783aede77cd9a78a12350d58ae11d7bad078bcac0be16f71bf1c96b025bd7d6d1d1917f329e6b1d18f9724a1cebd58d4636e0f1bb08 SHA512 d83b319266afc2920217a26abc53d854ae896b96e9e89eea72a418a560418c84473d7f4c08393420052d18133b2b9074389b5c048f6a50e279d5929bc8d86aed
 MISC metadata.xml 380 BLAKE2B f3b5ac60750d5c17573f08a144e12ed04890b6f9da7a0abfe982a37ace5a2fb6d8f1de5aa6e4cfd12f99b32aab421489d0fa3877cfa47db89a2b3740416dc9cc SHA512 ef95981a5ee3e4f7583c7f8b90b05e91b0e95e389746242d66ed354a26ba8471a35f3b8587543fa0201d6fcfdaac8c58fefc70aeac3f703e4f98a0e68e5a17b5
diff --git a/x11-misc/xsri/xsri-2.1.0-r3.ebuild b/x11-misc/xsri/xsri-2.1.0-r3.ebuild
deleted file mode 100644
index d0b56abeec3b..000000000000
--- a/x11-misc/xsri/xsri-2.1.0-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils rpm
-
-DESCRIPTION="The xsri wallpaper setter from RedHat"
-HOMEPAGE="http://fedoraproject.org"
-SRC_URI="http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/source/SRPMS/${P}-17.fc12.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README
-	doman ../${PN}.1
-}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 96be50e83e34..677b1826caa4 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/pidgin-skypeweb/Manifest b/x11-plugins/pidgin-skypeweb/Manifest
index 7e1e92e3370a..35000709c48a 100644
--- a/x11-plugins/pidgin-skypeweb/Manifest
+++ b/x11-plugins/pidgin-skypeweb/Manifest
@@ -1,4 +1,6 @@
 DIST pidgin-skypeweb-1.5.tar.gz 295956 BLAKE2B 0a45c709570c9093df9f0e674e5556a21b832b5e73ab2f32d439aa4fe3ce224df0bab05e054ef352ed337113e6800020cf0da60a7b37a6f39a22fc95ad40d28b SHA512 93043b83132654144f333e90bdff88dec5efe2495412a0b40f0ab64ec96d9427acea553ff73dee054de87e77121cbfd1a7bcaddeb17ab4d91baef55d658b6478
+DIST pidgin-skypeweb-1.7.tar.gz 297565 BLAKE2B 94d4fe7b6408fe054bdb79729493929551aabce03c9157992c7cab283c360adfa20c0b9775d82ec7017d762e208259fbf365e6311df566eda033f5a8c71ce20a SHA512 0981aefe23a7bce423fbc447ae22f79077742ac5cc1fd235611acc34175b4a6d9fd4a4af38f7fc3aa7ff7442be71a70c68ca8c271adbe39c085d6ae599cb0871
 EBUILD pidgin-skypeweb-1.5.ebuild 658 BLAKE2B 4e608465edab12b481ebeab075d9cb9e5de9519c62856de3e2780abb06d302f1d91f4a259d162b7cdb0539ec93e26be57eb51c602e4bfabd09573d0463747552 SHA512 449de42850da9881b7451b5558efc50f3305808da197a30302c2bded746bb464134658f53bea3b54b4931444e6d1596fc25e375dc5a7ed8f4e8d103c2b2e1edb
+EBUILD pidgin-skypeweb-1.7.ebuild 667 BLAKE2B 99582ccea996c734104be87d4ae604288edf1590266538dec9eee721893d79cec8213b9cef244af8bcffad9edff862c9971fccd134e2efb2b99a0b186ead27ea SHA512 a92e21392bed475a432f7e80438947f866dae146a7ea18d03df229957c55dc5617c98f649dbedad154aaf6ff09856bc9a6d56f2f5c5385c3a2ec623cb49e7248
 EBUILD pidgin-skypeweb-9999.ebuild 408 BLAKE2B c50234601349c4107d201a14625b51c407201c4cee9bab54d8ca965d97eaa3ed5c871ea23dcc15b30ba66e96b8a218c98adf84716dc94c72c5e7297c27ab1bba SHA512 f9cafbad41529d2c308da61cbae62c9e38cb4cd42895d142c443ece9daf4bf47d471e0b7a1f017d45cd88b6414de02542ef8244b1856ae1135344a1fd1ae8398
 MISC metadata.xml 444 BLAKE2B 99319eb5979a7e51ff0699ae5c524c2eee61fcc6407a32c8e5323a1f029b1f9bf2c0f56508bd4bd18e59a70256d6e62f9e0c86973577496e7e990ba565c855da SHA512 dcaaa5cd9f80a414d5931e39228f85482a086f1a55d5b44933feedb0949c2277847df60400bb8cde6a57d3524f8b52f384b1eba5728e6aea523ee6161381f734
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.7.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.7.ebuild
new file mode 100644
index 000000000000..c99028c2b379
--- /dev/null
+++ b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="SkypeWeb Plugin for Pidgin"
+HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
+SRC_URI="https://github.com/EionRobb/skype4pidgin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="dev-libs/json-glib
+	net-im/pidgin"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/skype4pidgin-${PV}/skypeweb"
+
+pkg_postinst() {
+	elog "If you get error message like 'Failed getting Magic T value':"
+	elog "Go to https://web.skype.com ; Log In and follow the instructions to enable your account!"
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index c4daf7779bfa..e28e6ab626a4 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index 28194bf3f858..e143cdb8408e 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -1,5 +1,6 @@
 AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 384 BLAKE2B ce0573ff1da58ce35c887d3ccc7291231acd0cd57232e0af95404b7ca2100d05db780a1a85878f2b082ef33582b6c202d99a72cafef2e9b247397eb0358e3bd9 SHA512 f2fc886135eb2267d3cdf45d34d151146e473b5b46697e10b44649dde3a05d9ddebbe469d2d7c0b042a26c3986e7a0f88caef049d908517c9cbcf7115688c9b4
+AUX mrxvt-0.5.4-fno-common.patch 430 BLAKE2B b5fa23b21524ab486a9c95863af1f858727778a2cdec363e800666bf3518bd1dcb85fbc9e2cb5e90def93ac4243e89f1aea7c73b9c1bca225f4a88ada9415450 SHA512 1def1813c0db009534259d9319cac827d1dfb0aed3751cba9e1a56fe53ab5819a208f54f7eeef25da26302bf81ab4a43ffc7d9b47a0d60871baed6552bd505a8
 AUX mrxvt-0.5.4-libpng14.patch 849 BLAKE2B d12e4a2e14d0073b28c0fb3c8a834fc4f1f3684a1d98fd432f058dce2bd2b0e0b86b47d5b1b41c612ea7983596709dda1e180665913d760c587bc1ed1d4f4fa2 SHA512 a5f4c3c2c80e1ffbf55d98b5dc563616e924c5286610308041649c21b883354061eca58e058d000ad6e1ad0e845e86bba5a7327fd96def28cf823f1c80f01495
 DIST mrxvt-0.5.4.tar.gz 603978 BLAKE2B 7abea6035620f4d93208458cdf994ad57ae47376364c65fe8e62542f013a65a4760df24c0a2c9d5fdecb76f20b895417792f773a32a7624836cda458b948dd3f SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992
-EBUILD mrxvt-0.5.4.ebuild 3453 BLAKE2B 0c797c8533a38dda2a98844a9046ec7cc625e5ed8f261118f881258be5991bddd3a69fe3eb82fc675a9b44333cec32fbe6fb5567640dd7672c5da489f58833e5 SHA512 0729c682c6f20a749aec36ed30a811d57ffff38c66bf254910e314a67e772afd87a1b93a1468c31927bf2395050fedfe84c12c50fe69eb94d0aab969da56869e
+EBUILD mrxvt-0.5.4.ebuild 3488 BLAKE2B f20e2fc6fdce8a128948d036425a331fee3de9ec5081fb103a15fa589062ab4de72400f6ae6793e4fb3b9c79b1df78c4c2a0c6d10e66179883dbc665143efc2c SHA512 92d01241b1874cb8ae6fb2ddc8cb000b28c927e0079ebf2179321b0ad5736230bf4e2c291ca74a1dd8581955582904ff19710433fd0edcfdbe0146041e7eaf59
 MISC metadata.xml 478 BLAKE2B a0f3413f95c5926e2fa4294967283d32f94081447f5d37d0f57b81a54cd50f3bd1ba8790eaf23fcbf7e5bdeeff21da5e392030f5869100dffa6478201bf2954b SHA512 fb26a82c0a26b3e23e9307ab811cc05fc6affce3bdf705d9417d8f10de7c8448b506414da9134888f4fc3c6fbf4d261646b77916730df711a0e86952a352ce72
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
new file mode 100644
index 000000000000..2bb39a423aed
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/rxvtlib.h
++++ b/src/rxvtlib.h
+@@ -790,7 +790,7 @@ typedef struct {
+ } action_t;
+ 
+ /* Values for macro_t.type. Must sync this with macroNames from macros.c */
+-enum {
++enum macroFnNames {
+     MacroFnDummy=0,
+     MacroFnEsc,
+     MacroFnStr,
+@@ -820,7 +820,7 @@ enum {
+     MacroFnSaveConfig,
+     MacroFnToggleMacros,
+     NMACRO_FUNCS
+-} macroFnNames;
++};
+ 
+ typedef unsigned char macro_priority_t;
+ typedef struct {
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index 2090e188130d..dbbfd4f073da 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils
+
+inherit autotools
 
 DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support"
 HOMEPAGE="http://materm.sourceforge.net/"
@@ -15,31 +16,37 @@ KEYWORDS="~alpha amd64 ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 L10N_IUSE="l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW"
 IUSE="debug png jpeg session truetype menubar utempter xpm ${L10N_IUSE}"
 
-RDEPEND="png? ( media-libs/libpng )
-	utempter? ( sys-libs/libutempter )
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
 	jpeg? ( virtual/jpeg )
-	truetype? ( x11-libs/libXft
+	png? ( media-libs/libpng:= )
+	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
-		elibc_uclibc? ( dev-libs/libiconv ) )
-	x11-libs/libX11
-	x11-libs/libXt
-	xpm? ( x11-libs/libXpm )
-	x11-libs/libXrender"
-
-DEPEND="${RDEPEND}
+		x11-libs/libXft
+		elibc_uclibc? ( dev-libs/libiconv )
+	)
+	utempter? ( sys-libs/libutempter )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
-	eapply "${FILESDIR}"/${P}-libpng14.patch
-	eapply_user
+PATCHES=(
+	"${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
+	"${FILESDIR}"/${P}-libpng14.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
+src_prepare() {
+	default
 	eautoreconf
 
 	if use elibc_uclibc && use truetype; then
 		# It is stated in the README "Multichar support under XFT requires GNU iconv"
-		sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/' "${S}/src/Makefile.in"
+		sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/' src/Makefile.in || die
 	fi
 }
 
@@ -102,7 +109,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -z $RXVT_TERM ]]; then
+	if [[ -z ${RXVT_TERM} ]]; then
 		einfo
 		einfo "If you experience problems with curses programs, then this is"
 		einfo "most likely because of incorrectly set termcap / terminfo"
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index b8feef196cd1..c6ef4c1f81cc 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 7d6e612bee0d..d435024701fc 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -2,5 +2,5 @@ DIST adwaita-icon-theme-3.32.0.tar.xz 18540012 BLAKE2B a82ca6758cdbf459ac617d3b3
 DIST adwaita-icon-theme-3.36.1.tar.xz 17247020 BLAKE2B 51461ff3058f413cacea9b7ec76bedd13e7adc38fa2aa9a80e84718f371463d9cc2b2be80ef10e375bf670658d184680ecadc7f84089e8b5ee09a39bf9fa1924 SHA512 5df33c8592ebd17e05fb36590423177fa3e07345565302a5b7ef58fb7d7a9b2b3a1789907a81f5ca0abc7446f7e83af059ca9d6432e8182d5274394c79a24fb9
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD adwaita-icon-theme-3.32.0.ebuild 1653 BLAKE2B cdb2f6f32ff05764cf1565dd791a542bfcf5feedae2e6c74d302489a4dd1052a23d7ae5bd151eff5c18ce77ac239a3c610e13780221859f0653f2f8aeb7d5afe SHA512 d23d394b6bf1d6897dc9f58cac0cc8bb0113dee3b22a99843065391739936cbf36ee115c15dfcc4bad5b3339e67d35f53b04fdd7ca257162dc2ee8cc103f0a76
-EBUILD adwaita-icon-theme-3.36.1.ebuild 2024 BLAKE2B 494e926dc84e813ab8beafd00f6513bc71c91d8da964e2b16c7c46bbeac90c07fc46bc7225353f1133d61dc89333893cac1bea3d1b50d4132bdbeb26ad4cf85d SHA512 e036e1f965c17afb1f017f516bb2bbe406c800547df93000c8b3505f2c5b95c30c3de5e9a40248174d10c8f90db3522fce19bad6697954d76dfc221079fcc2cb
+EBUILD adwaita-icon-theme-3.36.1-r1.ebuild 1950 BLAKE2B 3fcbec7efd08927e514de81bec0d7c31403225c0dcba91781c6a246767e1c9cdf13ecbe0cdbe43cec57bae3bdb30ada2a05ca30d72f53fc34b2fd2d27b52dd1b SHA512 613fcbdb359876c36fa58493277cde94f116bb539cf0ca9c9a974fff942ae38bd7526d4bbe7e890c19d2581d8c9ff8d22ccf81514a167284e5d4097bb24c9652
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild
similarity index 91%
rename from x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
rename to x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild
index f75c14047992..42cbbedd2a10 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild
@@ -17,13 +17,13 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
 RDEPEND="
 	>=x11-themes/hicolor-icon-theme-0.10
-	gnome-base/librsvg:2
+	>=gnome-base/librsvg-2.48:2
 "
 DEPEND="${RDEPEND}
 	x11-libs/gtk+:3
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index ef1fd58449bc..97a04466d2ae 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 69970f3f9540..44ebed38111d 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -3,5 +3,4 @@ AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb05
 AUX aewm-1.3.12-r1-gentoo.patch 2259 BLAKE2B 427a3286dfdf7170866a2e8b73b14259f390553fb53fc60780c6e5a8c87c224b46d6fcecda2784a17024ded5e513c1ca6be71a5aad5bd7dd6a82e783e6a4c8d6 SHA512 e3039462193018661acf9ed6532c67034a1352e381bb378a41ca3493580dfe847fa244b41389c37b3882fb5d0db4a26b9c6067b25a47134cc2d39f88b53415c9
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
 EBUILD aewm-1.3.12-r1.ebuild 861 BLAKE2B 8d0d4d5539bdb487dfd198e665c95f547e7271be94331c6cb87166798a720a975a9aa3a3cceaee4746438790414eeedc478068354bf701d4c81109fa2166c881 SHA512 d81b797d708481bb305587cf1d49a13e58a3c660602330b625ef04178079dcda3cdf581cc0b93d7b896db97ef110f5f47dea09300ea4ed87a912812520b74fec
-EBUILD aewm-1.3.12.ebuild 951 BLAKE2B 1ff4d9bcc9a1c81ae28eb061ed0d2dd588bee2a57d69621387ead0654284c654b8d2c1dbb7b7978094c799b3263a37ca433e00e9a59e9d732950f20be88392ff SHA512 3b0e6f2b45500c6120f2a813b7e5a031464f22820a0b518c06526d39cc4a5e2a4fcd1f85b929ba57a0b5351d677dfba63fc78a7499879d754a9b0bbd0727d606
 MISC metadata.xml 517 BLAKE2B db81b6c45753c24205433ed2b9cf2bc9a595f806992475a1d41697b6b92d2c1d18ff8eef0fb9f882b68eb184d317839507b2f1158e5f421f3b8af65fd64291e7 SHA512 7095bff22d6bd655a93e3c1d48b8fecf8e327f1efd07638caba28163ad2a21129ed6f0e2a904113ce629ae25c2ee029d863c7e777f0457caf78f5e71c684b080
diff --git a/x11-wm/aewm/aewm-1.3.12.ebuild b/x11-wm/aewm/aewm-1.3.12.ebuild
deleted file mode 100644
index 3bd723e335ba..000000000000
--- a/x11-wm/aewm/aewm-1.3.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A minimalistic X11 window manager"
-HOMEPAGE="https://www.red-bean.com/decklin/aewm/"
-SRC_URI="https://www.red-bean.com/decklin/aewm/${P}.tar.bz2"
-
-LICENSE="MIT 9wm"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	sed -i -e '/^font/s|".*"|"fixed"|g' doc/aewmrc.ex || die
-	sed -i -e 's|skill|pkill|g' doc/clientsrc.ex || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		MANDIR="${D}/usr/share/man/man1" \
-		XROOT="/usr" \
-		install
-
-	dodoc NEWS README
-}
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 5c50fccb73e8..8886de99bb13 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -3,10 +3,8 @@ AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa
 AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be66d110441075839484b6bb26667104090258267b3e484c6fc0b0650349488902d216f3cf841c23e45b59e SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45
 AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196
 AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f
-DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6e96c7d20517e10dc93b85b295d941c700786f53231045b1b76e6d069b0387942ccf55b8543b0efe9ae303520 SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698
 DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
-EBUILD fvwm-2.6.5-r3.ebuild 4829 BLAKE2B 00dc802a709c4ac1bdec33b723899895f26fe20e70ff245838c142d25b24eae646a16c93ba342395684b914ec52c3bd9f256efe5a4f876232b40b33bcb286277 SHA512 c1ae5188318030d01b65f6429874a990fe8df1a62afefe265e82beade9b5960958a40fd3f578c8ed1e34a10ec060ae6d2d277b493a399d292435585872152e25
 EBUILD fvwm-2.6.8-r2.ebuild 4105 BLAKE2B 8453a380d28fe71055c5fbfb73d0c4084409393c1be91e52ef772315389a413e902b14ee618d072449da9803b949ecc9192bb8b43dab3dc11ed0400b9a85d4bc SHA512 a783b93180542b66a5f2d394cba759f6af7fb4e51bdfb881f671aab3a9f4c62ed36fcee1e3e47d322a416d6d8153c74a888373b674599844e8dcbb425b0095b2
 EBUILD fvwm-2.6.9.ebuild 4102 BLAKE2B 875b3f30630d9fba8b1f2722f294b0dedc3fef1d1226c0f1d39027c6c1dbe7f85a4fc88fa20225050e4b1a0604ebce9a74ffcfb9c0c39e8315d2ad6deb238b9e SHA512 9d367e2b42c7db780721b21ac604058d54ad13f5f120026d7f41c2a22e9ab8248ed7468a2f7f24e9a60223bfb82c7ce640e1b0bafd5893863f16207375b13b79
-MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581
+MISC metadata.xml 707 BLAKE2B 6b51c0eccf9ca01664d552a5f2dca340bbabbbd4753fd2248923c3ed73df76279de6001790c188ed7ccf7c6d769648c8e271f8992492be215cd609f62aef461a SHA512 1be8383a2a6f0f4e4c4ae8728657783bbd7ed98d23bc35453eef5de18a898136ff92dc82e1acb431853f8cf42c8fea3fcb56efe5d448a6657bbe4b9258fa6086
diff --git a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
deleted file mode 100644
index 62f0374f99b3..000000000000
--- a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="http://www.fvwm.org/"
-SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
-
-LICENSE="GPL-2 FVWM"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="bidi debug doc gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	png? ( media-libs/libpng:0= )
-	readline? (
-		sys-libs/ncurses:0=
-		sys-libs/readline:0=
-	)
-	stroke? ( dev-libs/libstroke )
-	svg? ( gnome-base/librsvg )
-	truetype? (
-		media-libs/fontconfig
-		x11-libs/libXft
-	)
-	xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	gtk2-perl? ( dev-perl/Gtk2 )
-	perl? ( tk? (
-			dev-lang/tk
-			dev-perl/Tk
-			>=dev-perl/X11-Protocol-0.56
-		)
-	)
-	rplay? ( media-sound/rplay )
-	lock? ( x11-misc/xlockmore )
-	userland_GNU? ( sys-apps/debianutils )
-	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( dev-libs/libxslt )
-"
-
-src_prepare() {
-	if ! use vanilla; then
-		# Enables fast translucent menus; patch from fvwm-user mailing list.
-		epatch "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
-
-		# Allow more mouse buttons, bug #411811
-		epatch "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
-
-		# Apply user-provided patches to the source tree, bug #411811
-		epatch_user
-	fi
-
-	epatch "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
-	epatch "${FILESDIR}/${PN}-2.6.8-perl528.patch" #674742
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs --without-gnome"
-
-	# Non-upstream email where bugs should be sent; used in fvwm-bug.
-	export FVWM_BUGADDR="desktop-wm@gentoo.org"
-
-	# Recommended by upstream.
-	append-flags -fno-strict-aliasing
-
-	# Signed chars are required.
-	use ppc && append-flags -fsigned-char
-
-	myconf="${myconf} --disable-gtk"
-
-	use readline && myconf="${myconf} --without-termcap-library"
-
-	econf ${myconf} \
-		$(use_enable bidi) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug command-log) \
-		$(use_enable doc htmldoc) \
-		$(use_enable nls) \
-		$(use_enable nls iconv) \
-		$(use_enable perl perllib) \
-		$(use_with png png-library) \
-		$(use_with readline readline-library) \
-		$(use_with rplay rplay-library) \
-		$(use_with stroke stroke-library) \
-		$(use_enable svg rsvg) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--docdir="/usr/share/doc/${P}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
-
-	# These are always removed, because gentoo doesn't have anymore
-	# a dev-perl/gtk-perl package, so, these modules are pointless.
-	rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"
-	find "${D}" -name '*FvwmGtkDebug*' -exec rm -f '{}' \; 2>/dev/null
-
-	if ! use lock; then
-		find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
-	fi
-
-	if use perl; then
-		if ! use tk; then
-			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
-			if ! use gtk2-perl; then # no tk and no gtk2 bindings
-				rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"
-				find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null
-			fi
-		fi
-
-		# Now, the Gtk2.pm file, it will require dev-perl/Gtk2
-		# so it implies gtk2 as well. That's why we need another use flag.
-		if ! use gtk2-perl; then
-			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"
-		fi
-	else
-		# Completely wipe it if ! use perl
-		rm -rf "${D}/usr/bin/fvwm-perllib" \
-			"${D}/usr/share/man/man1/fvwm-perllib.1"
-	fi
-
-	# Utility for testing FVWM behaviour by creating a simple window with
-	# configurable hints.
-	if use debug; then
-		dobin "${S}/tests/hints/hints_test"
-		newdoc "${S}/tests/hints/README" README.hints
-	fi
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" || die
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	dodoc AUTHORS ChangeLog NEWS README \
-		docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
-		docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm}
-
-	# README file for translucent menus patch.
-	if ! use vanilla; then
-		dodoc "${FILESDIR}"/README.translucency
-		ewarn "You are using a patched build, so, please, don't"
-		ewarn "report bugs at the fvwm-workers list unless you are"
-		ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
-	fi
-}
diff --git a/x11-wm/fvwm/metadata.xml b/x11-wm/fvwm/metadata.xml
index 63c21e06e5f1..e9ad5b468010 100644
--- a/x11-wm/fvwm/metadata.xml
+++ b/x11-wm/fvwm/metadata.xml
@@ -9,7 +9,6 @@
 		implementing functional extensions.
 	</longdescription>
 	<use>
-		<flag name="gtk2-perl">Enable GTK2 Perl bindings</flag>
 		<flag name="lock">Enable screen locking</flag>
 		<flag name="netpbm">Enable NetPBM support (used by FvwmScript-ScreenDump)</flag>
 		<flag name="rplay">Enable rplay support</flag>
diff --git a/x11-wm/goomwwm/Manifest b/x11-wm/goomwwm/Manifest
index 390c27d32ebc..05348f14e648 100644
--- a/x11-wm/goomwwm/Manifest
+++ b/x11-wm/goomwwm/Manifest
@@ -1,6 +1,4 @@
 DIST goomwwm-1.0.0-github.tar.gz 406143 BLAKE2B 0118dfec32a3598b0a23b3421643a211386c1bc302d523a4a63a78e34ba9f0673b0bae18b27b491ab153e3e0fb8031123c56425ac007c20651fb3ec8484ab7a5 SHA512 e37d80c8ea47fe136172c392521ec8d4dab361c3469d3d1626ed7c30385513301983c0ffde39f4c2e6f2dee8709da6a34f14f7bb89776f1ccde5103ab1a26764
-DIST goomwwm-1.0.0.tar.gz 69967 BLAKE2B 562666d3a2d9121d07f00a339776f8c510f04eefae0f49f3f9475af250803194b8f4b1eb2673799f3f8b365a6623e5c1b1e49e009ed830699fca51a0846c0ffa SHA512 a2d486e7b97ef3dd0c6eb0702a21e51853ed1456aee7c1d11c90561a62218a4970a61ebb9ba7551428d72035066d7be445a952083baf9c53957e351ad8f4b5de
 EBUILD goomwwm-1.0.0-r1.ebuild 793 BLAKE2B 490a4295bdabbba0ccee236ce3cfb749b56cd062e7e7c3f3561d35f04d162a7ad76d5756a4987adaf6c3bc9d6279bc5e5f9a2b71a909c0db34f842e0b97b25ce SHA512 7cfc759b3603a529c5f8d155b1cc0fef0afc890952204714501234b3c0e0ce3c2d731c6d5f1376689dbe5d53722c7ce0782e537e87b5a626f4a3b161657e5c5a
-EBUILD goomwwm-1.0.0.ebuild 741 BLAKE2B 51569a0c598ce722c8dd9db2577415613a2240b91f13701c3495680122c90ffdcaa76e201c4be930673f7968aa8b26e1acef2ab0840e02004dcd984e8369f5de SHA512 05822f05bcd943d87aed6ad1a9be461fbd50836a6ec897556842aff54c1dc3e6a95f1bab1bbef1da48e20a6e59c12267e5e8764acbabc117adcc72f2143f9975
 EBUILD goomwwm-9999.ebuild 752 BLAKE2B 80c360c689a694146c97d4fe69d8aa3cb5f591650bd015f4d8b3ce7240a571d48ddb14173418c378e8183361fe56f7843d6e9dfd18f47916f2ef6d286c663e6d SHA512 1e6eb95eac110029267de0e6a1d04f724335782b5a9831482f7feb7808195d25ad182c8bc49405d66f1116bea0c1c072edee5da72f9a72b4e742483be3df8551
 MISC metadata.xml 251 BLAKE2B 6fdd68cc8939870f258fd5749d367c53b66f787e241031f8af90435dc958045b805403d2457a51c6253506a52028ed412f14a405691673edc2e0edc77af43b76 SHA512 6d3cd2984b10fdaf21af0348f49303eae89aee923d8371ce49bee8e3e27d8c3ed595d793d0bdd9adc2b1fab44873f6bebd922eeb9d48c9e6629c6c2fa6c5400e
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
deleted file mode 100644
index d76d1d60f37d..000000000000
--- a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Get out of my way, Window Manager!"
-HOMEPAGE="http://aerosuidae.net/goomwwm/"
-SRC_URI="http://aerosuidae.net/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	x11-libs/libXft
-	x11-libs/libX11
-	x11-libs/libXinerama
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	sed -i -e 's|$(LDADD) $(LDFLAGS)|$(LDFLAGS) $(LDADD)|g' Makefile || die
-}
-
-src_configure() {
-	use debug && append-cflags -DDEBUG
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) proto normal
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index be7ceb355046..feaf2ef04724 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -2,5 +2,5 @@ DIST pekwm-0.1.17.tar.bz2 405742 BLAKE2B 6cb47f92f8d32358ece8502fd706880478403ec
 DIST pekwm-0.1.17.tar.gz 429100 BLAKE2B 2b467539ef47f4404411f25146f9f945f9a63b7e4c85c997ed2cd0bf76ea713758e3a09dc9648064c02ab29818399623d12d78394f250c79f8f667a6e057281c SHA512 1950888402f11c5cd72c9d82de976c472d4a0443da206629a039d19a1729660fd7cd09535d35984d554dcdb366918d9e29536b1272521f36f7e54499df0c14af
 DIST pekwm-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d
 EBUILD pekwm-0.1.17-r1.ebuild 1695 BLAKE2B 4f9f97e2ed2bfe595283c2bd5e7dae38f620d640b6bf4e9422a5bc4434628c77a51fba7aafc82ef988551d45d948b2949d0470903fce65520c12c3d846af909c SHA512 1c0471b6b671428e1227bfbad8ebbe48a0783bcfcf4561d5c3db74dd907264bbd30eb3c3654bbd5a1bde0a520417186e3e6a1c8d5bc862c0fc691969389a7e0c
-EBUILD pekwm-0.1.17-r2.ebuild 1838 BLAKE2B 40795ce2f870024b519d76ea7989a62d805cf92b98b47a99ec3d3546fcbe756dad66f6c435e4c5adf3429a705e380c03fd34e1e037827b4ba48d1cabda106149 SHA512 2716cace727eec86daeef1b53754339cf50962421ff48b09a8c928dab4b7735cc369518a00165653f582df6410b0a55f05a0d716eda0580d0d9ad07990c9b7f3
+EBUILD pekwm-0.1.17-r2.ebuild 1836 BLAKE2B 5a60d05b4dbce629ad1ba3c1aae592340653fbee209eeb49f6244d96b6691b5e9b15ecf75c2063b5d22d0317466421d2a6ae2923d393771f9d6186b57e4c6d10 SHA512 9a9ae0ac60851d0ed926d142cec901e28e0b3d495420513cc0522698bba757a4a2ef7bbf993b83dc7edc6e5f3c57bb00fc7d327a8d4db25ff6bb4638717748a3
 MISC metadata.xml 968 BLAKE2B 61ebb7661defcb80be3a193ea230be7d657503fe5a4885496fe58152bb63b323f6b94de08b8df52608b640ceba2155c5041a2e452558093571d0bce55b15fd8f SHA512 02042a7c09730767185d59cbd0152a0286d8c1e8c7d9bdcbbed6ed9856c576372dbd3f4375b389d32f207939bdf7a4e60db5804bad07e81d689b79668e77bcba
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
index c5b8371db7c8..526ace6008e3 100644
--- a/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
 IUSE="contrib debug themes truetype xinerama"
 
 RDEPEND="